These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / core / rtw_debug.c

diff --git a/kernel/drivers/staging/rtl8188eu/core/rtw_debug.c b/kernel/drivers/staging/rtl8188eu/core/rtw_debug.c
index bc3fe10..2c4afb8 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/core/rtw_debug.c
+++ b/kernel/drivers/staging/rtl8188eu/core/rtw_debug.c
@@ -219,6 +219,7 @@ int proc_get_ht_option(char *page, char **start,
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
        int len = 0;
+
        len += snprintf(page + len, count - len, "ht_option=%d\n", pmlmepriv->htpriv.ht_option);
        *eof = 1;
        return len;
@@ -588,12 +589,12 @@ int proc_set_rx_signal(struct file *file, const char __user *buffer,
 
        if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
                int num = sscanf(tmp, "%u %u", &is_signal_dbg, &signal_strength);
+
                is_signal_dbg = is_signal_dbg == 0 ? 0 : 1;
                if (is_signal_dbg && num != 2)
                        return count;
 
-               signal_strength = signal_strength > 100 ? 100 : signal_strength;
-               signal_strength = signal_strength < 0 ? 0 : signal_strength;
+               signal_strength = clamp(signal_strength, 0, 100);
 
                padapter->recvpriv.is_signal_dbg = is_signal_dbg;
                padapter->recvpriv.signal_strength_dbg = signal_strength;
@@ -917,7 +918,7 @@ int proc_get_best_channel(char *page, char **start,
                /*  5G */
                if (pmlmeext->channel_set[i].ChannelNum >= 36 &&
                    pmlmeext->channel_set[i].ChannelNum < 140) {
-                        /*  Find primary channel */
+                       /*  Find primary channel */
                        if (((pmlmeext->channel_set[i].ChannelNum - 36) % 8 == 0) &&
                            (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count)) {
                                index_5G = i;
@@ -927,7 +928,7 @@ int proc_get_best_channel(char *page, char **start,
 
                if (pmlmeext->channel_set[i].ChannelNum >= 149 &&
                    pmlmeext->channel_set[i].ChannelNum < 165) {
-                        /*  find primary channel */
+                       /*  find primary channel */
                        if (((pmlmeext->channel_set[i].ChannelNum - 149) % 8 == 0) &&
                            (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count)) {
                                index_5G = i;