staging: rtl8192e: Remove variable ieee->short_slot

ieee->short_slot also named priv->rtllib->short_slot is initialized to 1
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/74fe53ccfafe2e0e18319b5502ed83544cc3ffd8.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 a245275851665744d869a72fec03243232ff1d55..aaff8d739efea72f24d42ee40c872fddce909dd5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -774,7 +774,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->retry_data = DEFAULT_RETRY_DATA;
        priv->rtllib->rts = DEFAULT_RTS_THRESHOLD;
        priv->rtllib->rate = 110;
-       priv->rtllib->short_slot = 1;
        priv->promisc = (dev->flags & IFF_PROMISC) ? 1 : 0;
        priv->bcck_in_ch14 = false;
        priv->cck_present_attn = 0;

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index c7f800a0c48c8db4b08c91c8777c3e7a3852f9e7..aa8abec390ca967b693cfb9de1bb239800b17899 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1486,7 +1486,6 @@ struct rtllib_device {
 
        enum rtl_link_state link_state;
 
-       int short_slot;
        int mode;       /* A, B, G */
 
        /* used for forcing the ibss workqueue to terminate

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 23b33a2397030979dbddb5ca0153d061fec6ed80..584371f0ce579581ff8d1017413c4eff91a89c39 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -852,8 +852,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
                cpu_to_le16(ieee->current_network.capability &
                WLAN_CAPABILITY_SHORT_PREAMBLE);
 
-       if (ieee->short_slot && (ieee->current_network.capability &
-           WLAN_CAPABILITY_SHORT_SLOT_TIME))
+       if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
                beacon_buf->capability |=
                        cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
@@ -939,9 +938,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest)
        assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
                WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS);
 
-       if (ieee->short_slot)
-               assoc->capability |=
-                                cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
+       assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 
@@ -1190,8 +1187,7 @@ rtllib_association_req(struct rtllib_network *beacon,
        if (beacon->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
                hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
 
-       if (ieee->short_slot &&
-          (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME))
+       if (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
                hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
        hdr->listen_interval = cpu_to_le16(beacon->listen_interval);