staging: rtl8192e: Remove variable stats->freq as it is constant

stats->freq is initialized with 1 and then unchanged. All evaluations
will result accordingly. Remove resulting dead code and unused defines.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/4d8801d37889e6af4f43dff10d1426fc7918f562.1687007788.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 17b70dd..20c0308 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1769,7 +1769,6 @@ static void _rtl92e_rx_normal(struct net_device *dev)
                .signal = 0,
                .noise = (u8)-98,
                .rate = 0,
-               .freq = RTLLIB_24GHZ_BAND,
        };
        unsigned int count = priv->rxringcount;
 

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 87e9169..b4fad9b 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -500,9 +500,6 @@ enum _REG_PREAMBLE_MODE {
 #define RTLLIB_CCK_MODULATION    (1<<0)
 #define RTLLIB_OFDM_MODULATION   (1<<1)
 
-#define RTLLIB_24GHZ_BAND     (1<<0)
-#define RTLLIB_52GHZ_BAND     (1<<1)
-
 #define RTLLIB_CCK_RATE_LEN            4
 #define RTLLIB_CCK_RATE_1MB                    0x02
 #define RTLLIB_CCK_RATE_2MB                    0x04
@@ -549,10 +546,8 @@ struct rtllib_rx_stats {
        u8  signal;
        u8  noise;
        u16 rate; /* in 100 kbps */
-       u8  received_channel;
        u8  control;
        u8  mask;
-       u8  freq;
        u16 len;
        u64 tsf;
        u32 beacon_time;

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 46c77ed..36dace0 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -2301,12 +2301,7 @@ static inline int rtllib_network_init(
        network->CountryIeLen = 0;
        memset(network->CountryIeBuf, 0, MAX_IE_LEN);
        HTInitializeBssDesc(&network->bssht);
-       if (stats->freq == RTLLIB_52GHZ_BAND) {
-               /* for A band (No DS info) */
-               network->channel = stats->received_channel;
-       } else {
-               network->flags |= NETWORK_HAS_CCK;
-       }
+       network->flags |= NETWORK_HAS_CCK;
 
        network->wpa_ie_len = 0;
        network->rsn_ie_len = 0;
@@ -2321,14 +2316,10 @@ static inline int rtllib_network_init(
 
        network->mode = 0;
 
-       if (stats->freq == RTLLIB_52GHZ_BAND) {
-               network->mode = IEEE_A;
-       } else {
-               if (network->flags & NETWORK_HAS_OFDM)
-                       network->mode |= IEEE_G;
-               if (network->flags & NETWORK_HAS_CCK)
-                       network->mode |= IEEE_B;
-       }
+       if (network->flags & NETWORK_HAS_OFDM)
+               network->mode |= IEEE_G;
+       if (network->flags & NETWORK_HAS_CCK)
+               network->mode |= IEEE_B;
 
        if (network->mode == 0) {
                netdev_dbg(ieee->dev, "Filtered out '%s (%pM)' network.\n",