staging: rtl8192e: Remove delayed_work start_ibss_wq
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Fri, 22 Sep 2023 13:29:53 +0000 (15:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Sep 2023 09:14:11 +0000 (11:14 +0200)
Remove delayed_work start_ibss_wq and the related functions which are not
needed anymore.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/805447a41feffb9da7d82830868dc1d47f9aa737.1695387832.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl819x_HTProc.c
drivers/staging/rtl8192e/rtllib.h
drivers/staging/rtl8192e/rtllib_softmac.c

index fe9f6585266b44c58f25a913aa31bac4336c607d..9ffa9305ff5eae5014f55f612007f5b4920c4c4d 100644 (file)
 static int WDCAPARA_ADD[] = {EDCAPARA_BE, EDCAPARA_BK, EDCAPARA_VI,
                             EDCAPARA_VO};
 
-void rtl92e_start_beacon(struct net_device *dev)
-{
-       struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
-       struct rtllib_network *net = &priv->rtllib->current_network;
-       u16 BcnTimeCfg = 0;
-       u16 BcnCW = 6;
-       u16 BcnIFS = 0xf;
-
-       rtl92e_irq_disable(dev);
-
-       rtl92e_writew(dev, ATIMWND, 2);
-
-       rtl92e_writew(dev, BCN_INTERVAL, net->beacon_interval);
-       rtl92e_writew(dev, BCN_DRV_EARLY_INT, 10);
-       rtl92e_writew(dev, BCN_DMATIME, 256);
-
-       rtl92e_writeb(dev, BCN_ERR_THRESH, 100);
-
-       BcnTimeCfg |= BcnCW << BCN_TCFG_CW_SHIFT;
-       BcnTimeCfg |= BcnIFS << BCN_TCFG_IFS;
-       rtl92e_writew(dev, BCN_TCFG, BcnTimeCfg);
-       rtl92e_irq_enable(dev);
-}
-
 static void _rtl92e_update_msr(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
index 14a091ae1b7dbe4dd217c44a35b27c9929c822f2..878c962368249ccc00cd7857df836fb6608a3e71 100644 (file)
@@ -17,7 +17,6 @@ void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta);
 void rtl92e_enable_rx(struct net_device *dev);
 void rtl92e_enable_tx(struct net_device *dev);
 void rtl92e_init_variables(struct net_device  *dev);
-void rtl92e_start_beacon(struct net_device *dev);
 void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val);
 void rtl92e_get_eeprom_size(struct net_device *dev);
 bool rtl92e_start_adapter(struct net_device *dev);
index 03cabf88ce2be3a2ccd8ef65770ea25450069850..208c7bfd9bfe2d5438f0190a2597b6f48c3dc3ac 100644 (file)
@@ -700,7 +700,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
        priv->rtllib->set_bw_mode_handler       = rtl92e_set_bw_mode;
        priv->rf_set_chan                       = rtl92e_set_channel;
 
-       priv->rtllib->start_send_beacons = rtl92e_start_beacon;
        priv->rtllib->stop_send_beacons = _rtl92e_stop_beacon;
 
        priv->rtllib->sta_wake_up = rtl92e_hw_wakeup;
index 0f14d9eb4fcd26436c8bb769de808c4266c5981b..a7e356e90d0ea09f32396e27010cf967151f96c4 100644 (file)
@@ -743,38 +743,6 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
 }
 EXPORT_SYMBOL(HT_update_self_and_peer_setting);
 
-void HTUseDefaultSetting(struct rtllib_device *ieee)
-{
-       struct rt_hi_throughput *ht_info = ieee->ht_info;
-
-       if (ht_info->enable_ht) {
-               ht_info->bCurrentHTSupport = true;
-               ht_info->bCurSuppCCK = ht_info->bRegSuppCCK;
-
-               ht_info->bCurBW40MHz = ht_info->bRegBW40MHz;
-               ht_info->bCurShortGI20MHz = ht_info->bRegShortGI20MHz;
-
-               ht_info->bCurShortGI40MHz = ht_info->bRegShortGI40MHz;
-               ht_info->bCurrent_AMSDU_Support = ht_info->bAMSDU_Support;
-               ht_info->nCurrent_AMSDU_MaxSize = ht_info->nAMSDU_MaxSize;
-
-               ht_info->bCurrentAMPDUEnable = ht_info->bAMPDUEnable;
-               ht_info->CurrentAMPDUFactor = ht_info->AMPDU_Factor;
-
-               ht_info->current_mpdu_density = ht_info->current_mpdu_density;
-
-               HTFilterMCSRate(ieee, ieee->reg_dot11tx_ht_oper_rate_set,
-                               ieee->dot11ht_oper_rate_set);
-               ieee->HTHighestOperaRate = HTGetHighestMCSRate(ieee,
-                                                              ieee->dot11ht_oper_rate_set,
-                                                              MCS_FILTER_ALL);
-               ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;
-
-       } else {
-               ht_info->bCurrentHTSupport = false;
-       }
-}
-
 u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame)
 {
        if (ieee->ht_info->bCurrentHTSupport) {
index d10fddd4f9ad7c02e6555f829a1a0d0adb2dd58a..410401869ebbad92f95ff6343f51e7471e4e382b 100644 (file)
@@ -1445,7 +1445,6 @@ struct rtllib_device {
        struct delayed_work associate_procedure_wq;
        struct delayed_work softmac_scan_wq;
        struct delayed_work associate_retry_wq;
-       struct delayed_work start_ibss_wq;
        struct delayed_work hw_wakeup_wq;
        struct delayed_work hw_sleep_wq;
        struct delayed_work link_change_wq;
@@ -1502,7 +1501,6 @@ struct rtllib_device {
         * stop_send_bacons is NOT guaranteed to be called only
         * after start_send_beacons.
         */
-       void (*start_send_beacons)(struct net_device *dev);
        void (*stop_send_beacons)(struct net_device *dev);
 
        /* power save mode related */
@@ -1727,7 +1725,6 @@ void rtllib_reset_queue(struct rtllib_device *ieee);
 void rtllib_wake_all_queues(struct rtllib_device *ieee);
 void rtllib_stop_all_queues(struct rtllib_device *ieee);
 struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee);
-void rtllib_start_send_beacons(struct rtllib_device *ieee);
 void rtllib_stop_send_beacons(struct rtllib_device *ieee);
 
 void notify_wx_assoc_event(struct rtllib_device *ieee);
@@ -1869,7 +1866,6 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
 
 void rtllib_indicate_packets(struct rtllib_device *ieee,
                             struct rtllib_rxb **prxbIndicateArray, u8  index);
-void HTUseDefaultSetting(struct rtllib_device *ieee);
 #define RT_ASOC_RETRY_LIMIT    5
 u8 MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee);
 
index 434690eeed5ceebdf72dfac40372552dfba69a9c..4551071e9f1b83b3427d3d263ec464a2c5a22518 100644 (file)
@@ -607,18 +607,6 @@ out1:
        mutex_unlock(&ieee->scan_mutex);
 }
 
-static void rtllib_beacons_start(struct rtllib_device *ieee)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&ieee->beacon_lock, flags);
-
-       ieee->beacon_txing = 1;
-       rtllib_send_beacon(ieee);
-
-       spin_unlock_irqrestore(&ieee->beacon_lock, flags);
-}
-
 static void rtllib_beacons_stop(struct rtllib_device *ieee)
 {
        unsigned long flags;
@@ -639,14 +627,6 @@ void rtllib_stop_send_beacons(struct rtllib_device *ieee)
 }
 EXPORT_SYMBOL(rtllib_stop_send_beacons);
 
-void rtllib_start_send_beacons(struct rtllib_device *ieee)
-{
-       ieee->start_send_beacons(ieee->dev);
-       if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
-               rtllib_beacons_start(ieee);
-}
-EXPORT_SYMBOL(rtllib_start_send_beacons);
-
 static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)
 {
        mutex_lock(&ieee->scan_mutex);
@@ -2189,116 +2169,6 @@ static void rtllib_start_monitor_mode(struct rtllib_device *ieee)
                netif_carrier_on(ieee->dev);
 }
 
-static void rtllib_start_ibss_wq(void *data)
-{
-       struct rtllib_device *ieee = container_of_dwork_rsl(data,
-                                    struct rtllib_device, start_ibss_wq);
-       /* iwconfig mode ad-hoc will schedule this and return
-        * on the other hand this will block further iwconfig SET
-        * operations because of the wx_mutex hold.
-        * Anyway some most set operations set a flag to speed-up
-        * (abort) this wq (when syncro scanning) before sleeping
-        * on the mutex
-        */
-       if (!ieee->proto_started) {
-               netdev_info(ieee->dev, "==========oh driver down return\n");
-               return;
-       }
-       mutex_lock(&ieee->wx_mutex);
-
-       if (ieee->current_network.ssid_len == 0) {
-               strscpy(ieee->current_network.ssid, RTLLIB_DEFAULT_TX_ESSID,
-                       sizeof(ieee->current_network.ssid));
-               ieee->current_network.ssid_len = strlen(RTLLIB_DEFAULT_TX_ESSID);
-               ieee->ssid_set = 1;
-       }
-
-       ieee->link_state = MAC80211_NOLINK;
-       ieee->mode = WIRELESS_MODE_G;
-       /* check if we have this cell in our network list */
-       rtllib_softmac_check_all_nets(ieee);
-
-       /* if not then the state is not linked. Maybe the user switched to
-        * ad-hoc mode just after being in monitor mode, or just after
-        * being very few time in managed mode (so the card have had no
-        * time to scan all the chans..) or we have just run up the iface
-        * after setting ad-hoc mode. So we have to give another try..
-        * Here, in ibss mode, should be safe to do this without extra care
-        * (in bss mode we had to make sure no-one tried to associate when
-        * we had just checked the ieee->link_state and we was going to start the
-        * scan) because in ibss mode the rtllib_new_net function, when
-        * finds a good net, just set the ieee->link_state to MAC80211_LINKED,
-        * so, at worst, we waste a bit of time to initiate an unneeded syncro
-        * scan, that will stop at the first round because it sees the state
-        * associated.
-        */
-       if (ieee->link_state == MAC80211_NOLINK)
-               rtllib_start_scan_syncro(ieee);
-
-       /* the network definitively is not here.. create a new cell */
-       if (ieee->link_state == MAC80211_NOLINK) {
-               netdev_info(ieee->dev, "creating new IBSS cell\n");
-               ieee->current_network.channel = ieee->bss_start_channel;
-               if (!ieee->wap_set)
-                       eth_random_addr(ieee->current_network.bssid);
-
-               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);
-               ieee->current_network.mode = ieee->mode;
-               ieee->current_network.atim_window = 0;
-               ieee->current_network.capability = WLAN_CAPABILITY_IBSS;
-       }
-
-       netdev_info(ieee->dev, "%s(): ieee->mode = %d\n", __func__, ieee->mode);
-       if (ieee->mode == WIRELESS_MODE_N_24G)
-               HTUseDefaultSetting(ieee);
-       else
-               ieee->ht_info->bCurrentHTSupport = false;
-
-       ieee->SetHwRegHandler(ieee->dev, HW_VAR_MEDIA_STATUS,
-                             (u8 *)(&ieee->link_state));
-
-       ieee->link_state = MAC80211_LINKED;
-       ieee->link_change(ieee->dev);
-
-       HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
-       rtllib_start_send_beacons(ieee);
-
-       notify_wx_assoc_event(ieee);
-       netif_carrier_on(ieee->dev);
-
-       mutex_unlock(&ieee->wx_mutex);
-}
-
 /* this is called only in user context, with wx_mutex held */
 static void rtllib_start_bss(struct rtllib_device *ieee)
 {
@@ -2459,7 +2329,6 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown)
        rtllib_stop_send_beacons(ieee);
        del_timer_sync(&ieee->associate_timer);
        cancel_delayed_work_sync(&ieee->associate_retry_wq);
-       cancel_delayed_work_sync(&ieee->start_ibss_wq);
        cancel_delayed_work_sync(&ieee->link_change_wq);
        rtllib_stop_scan(ieee);
 
@@ -2593,7 +2462,6 @@ int rtllib_softmac_init(struct rtllib_device *ieee)
        timer_setup(&ieee->beacon_timer, rtllib_send_beacon_cb, 0);
 
        INIT_DELAYED_WORK(&ieee->link_change_wq, (void *)rtllib_link_change_wq);
-       INIT_DELAYED_WORK(&ieee->start_ibss_wq, (void *)rtllib_start_ibss_wq);
        INIT_WORK(&ieee->associate_complete_wq, (void *)rtllib_associate_complete_wq);
        INIT_DELAYED_WORK(&ieee->associate_procedure_wq, (void *)rtllib_associate_procedure_wq);
        INIT_DELAYED_WORK(&ieee->softmac_scan_wq, (void *)rtllib_softmac_scan_wq);
@@ -2622,7 +2490,6 @@ void rtllib_softmac_free(struct rtllib_device *ieee)
        cancel_delayed_work_sync(&ieee->associate_retry_wq);
        cancel_delayed_work_sync(&ieee->associate_procedure_wq);
        cancel_delayed_work_sync(&ieee->softmac_scan_wq);
-       cancel_delayed_work_sync(&ieee->start_ibss_wq);
        cancel_delayed_work_sync(&ieee->hw_wakeup_wq);
        cancel_delayed_work_sync(&ieee->hw_sleep_wq);
        cancel_delayed_work_sync(&ieee->link_change_wq);