staging: rtl8192e: Remove variable modulation as it is constant

ieee->modulation is initialized to 3 and then unchanged. All evaluations
will result accordingly. Remove resulting dead code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ebd543d097a65f105078c71faceaed2a4d5e7b55.1687583718.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 4447489a16ea38d79a8d939647df8052a2edc198..cb0753f6fb183b7a159e9c7022347922d2ad97fb 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -804,8 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->rtllib->iw_mode = IW_MODE_INFRA;
        priv->rtllib->active_scan = 1;
        priv->rtllib->be_scan_inprogress = false;
-       priv->rtllib->modulation = RTLLIB_CCK_MODULATION |
-                                  RTLLIB_OFDM_MODULATION;
        priv->rtllib->host_encrypt = 1;
        priv->rtllib->host_decrypt = 1;
 

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index e3ce4431d460ff3ebbb0b60cfeede67822962005..fdb7990130b55afd4de4155c3ab405247c05ced9 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1492,7 +1492,6 @@ struct rtllib_device {
 
        int short_slot;
        int mode;       /* A, B, G */
-       int modulation; /* CCK, OFDM */
 
        /* used for forcing the ibss workqueue to terminate
         * without wait for the syncro scan to terminate

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 425d4acbcdf047ad0ddd0fb5cabe1e8de29cf962..c1e5127f52518c163fc849227220b43d38223166 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -35,12 +35,8 @@ static unsigned int rtllib_MFIE_rate_len(struct rtllib_device *ieee)
 {
        unsigned int rate_len = 0;
 
-       if (ieee->modulation & RTLLIB_CCK_MODULATION)
-               rate_len = RTLLIB_CCK_RATE_LEN + 2;
-
-       if (ieee->modulation & RTLLIB_OFDM_MODULATION)
-
-               rate_len += RTLLIB_OFDM_RATE_LEN + 2;
+       rate_len = RTLLIB_CCK_RATE_LEN + 2;
+       rate_len += RTLLIB_OFDM_RATE_LEN + 2;
 
        return rate_len;
 }
@@ -53,14 +49,12 @@ static void rtllib_MFIE_Brate(struct rtllib_device *ieee, u8 **tag_p)
 {
        u8 *tag = *tag_p;
 
-       if (ieee->modulation & RTLLIB_CCK_MODULATION) {
-               *tag++ = MFIE_TYPE_RATES;
-               *tag++ = 4;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;
-       }
+       *tag++ = MFIE_TYPE_RATES;
+       *tag++ = 4;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;
 
        /* We may add an option for custom rates that specific HW
         * might support
@@ -72,18 +66,17 @@ static void rtllib_MFIE_Grate(struct rtllib_device *ieee, u8 **tag_p)
 {
        u8 *tag = *tag_p;
 
-       if (ieee->modulation & RTLLIB_OFDM_MODULATION) {
-               *tag++ = MFIE_TYPE_RATES_EX;
-               *tag++ = 8;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_6MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_9MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_12MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_18MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_24MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_36MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_48MB;
-               *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_54MB;
-       }
+       *tag++ = MFIE_TYPE_RATES_EX;
+       *tag++ = 8;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_6MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_9MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_12MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_18MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_24MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_36MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_48MB;
+       *tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_54MB;
+
        /* We may add an option for custom rates that specific HW might
         * support
         */
@@ -1465,8 +1458,7 @@ static void rtllib_associate_complete_wq(void *data)
 
        netif_carrier_on(ieee->dev);
        ieee->is_roaming = false;
-       if (rtllib_is_54g(&ieee->current_network) &&
-          (ieee->modulation & RTLLIB_OFDM_MODULATION)) {
+       if (rtllib_is_54g(&ieee->current_network)) {
                ieee->rate = 108;
                netdev_info(ieee->dev, "Using G rates:%d\n", ieee->rate);
        } else {
@@ -1652,9 +1644,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
                                schedule_delayed_work(
                                           &ieee->associate_procedure_wq, 0);
                        } else {
-                               if (rtllib_is_54g(&ieee->current_network) &&
-                                   (ieee->modulation &
-                                    RTLLIB_OFDM_MODULATION)) {
+                               if (rtllib_is_54g(&ieee->current_network)) {
                                        ieee->rate = 108;
                                        ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_G);
                                        netdev_info(ieee->dev,
@@ -2526,47 +2516,34 @@ static void rtllib_start_ibss_wq(void *data)
                if (!ieee->wap_set)
                        eth_random_addr(ieee->current_network.bssid);
 
-               if (ieee->modulation & RTLLIB_CCK_MODULATION) {
-                       ieee->current_network.rates_len = 4;
-
-                       ieee->current_network.rates[0] =
-                                RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB;
-                       ieee->current_network.rates[1] =
-                                RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB;
-                       ieee->current_network.rates[2] =
-                                RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB;
-                       ieee->current_network.rates[3] =
-                                RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;
-
-               } else {
-                       ieee->current_network.rates_len = 0;
-               }
-
-               if (ieee->modulation & RTLLIB_OFDM_MODULATION) {
-                       ieee->current_network.rates_ex_len = 8;
-
-                       ieee->current_network.rates_ex[0] =
-                                                RTLLIB_OFDM_RATE_6MB;
-                       ieee->current_network.rates_ex[1] =
-                                                RTLLIB_OFDM_RATE_9MB;
-                       ieee->current_network.rates_ex[2] =
-                                                RTLLIB_OFDM_RATE_12MB;
-                       ieee->current_network.rates_ex[3] =
-                                                RTLLIB_OFDM_RATE_18MB;
-                       ieee->current_network.rates_ex[4] =
-                                                RTLLIB_OFDM_RATE_24MB;
-                       ieee->current_network.rates_ex[5] =
-                                                RTLLIB_OFDM_RATE_36MB;
-                       ieee->current_network.rates_ex[6] =
-                                                RTLLIB_OFDM_RATE_48MB;
-                       ieee->current_network.rates_ex[7] =
-                                                RTLLIB_OFDM_RATE_54MB;
-
-                       ieee->rate = 108;
-               } else {
-                       ieee->current_network.rates_ex_len = 0;
-                       ieee->rate = 22;
-               }
+               ieee->current_network.rates_len = 4;
+               ieee->current_network.rates[0] =
+                       RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB;
+               ieee->current_network.rates[1] =
+                       RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB;
+               ieee->current_network.rates[2] =
+                       RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB;
+               ieee->current_network.rates[3] =
+                       RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;
+
+               ieee->current_network.rates_ex_len = 8;
+               ieee->current_network.rates_ex[0] =
+                       RTLLIB_OFDM_RATE_6MB;
+               ieee->current_network.rates_ex[1] =
+                       RTLLIB_OFDM_RATE_9MB;
+               ieee->current_network.rates_ex[2] =
+                       RTLLIB_OFDM_RATE_12MB;
+               ieee->current_network.rates_ex[3] =
+                       RTLLIB_OFDM_RATE_18MB;
+               ieee->current_network.rates_ex[4] =
+                       RTLLIB_OFDM_RATE_24MB;
+               ieee->current_network.rates_ex[5] =
+                       RTLLIB_OFDM_RATE_36MB;
+               ieee->current_network.rates_ex[6] =
+                       RTLLIB_OFDM_RATE_48MB;
+               ieee->current_network.rates_ex[7] =
+                       RTLLIB_OFDM_RATE_54MB;
+               ieee->rate = 108;
 
                ieee->current_network.qos_data.supported = 0;
                ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_G);

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 2de63d1f20095c9ca73a872104d07a4e1f3ad6a5..1a7575ab9d6d13b51ef8c130ebaff4958fa28abc 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -487,11 +487,9 @@ EXPORT_SYMBOL(rtllib_wx_set_rawtx);
 int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info,
                       union iwreq_data *wrqu, char *extra)
 {
-       const char *b = ieee->modulation & RTLLIB_CCK_MODULATION ? "b" : "";
-       const char *g = ieee->modulation & RTLLIB_OFDM_MODULATION ? "g" : "";
        const char *n = ieee->mode & (WIRELESS_MODE_N_24G) ? "n" : "";
 
-       scnprintf(wrqu->name, sizeof(wrqu->name), "802.11%s%s%s", b, g, n);
+       scnprintf(wrqu->name, sizeof(wrqu->name), "802.11bg%s", n);
        return 0;
 }
 EXPORT_SYMBOL(rtllib_wx_get_name);