staging: rtl8192e: Remove sending beacons
cover staging: rtl8192e: Remove sending beacons
This driver supports station infrastructure and monitor mode. Therefore it does not have to be able to send beacons. Remove all code with the preparation of beacons.
There are two ways to time beacons. One is via an interrupt from hardware and one is from a timer in the driver. Both are removed.
Tested with rtl8192e (WLL6130-D99) in Mode n (12.5 MB/s) Transferred this patch over wlan connection of rtl8192e.
Philipp Hortmann (8):
staging: rtl8192e: Remove unused interrupt for IMR_BcnInt
staging: rtl8192e: Remove unused function rtllib_get_beacon()
staging: rtl8192e: Remove unused timer beacon_timer
staging: rtl8192e: Remove unused function rtllib_send_beacon()
staging: rtl8192e: Remove unused function rtllib_get_beacon_()
staging: rtl8192e: Remove unused function rtllib_probe_resp()
staging: rtl8192e: Remove unused function HTConstructInfoElement()
staging: rtl8192e: Remove function rtl92e_update_rx_pkt_timestamp()
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 48 ---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 5 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 -- drivers/staging/rtl8192e/rtllib.h | 5 - drivers/staging/rtl8192e/rtllib_softmac.c | 219 ------------------ 6 files changed, 1 insertion(+), 296 deletions(-)
Signature · 1 line
2.42.0
PATCH 1/8 staging: rtl8192e: Remove unused interrupt for IMR_BcnInt
Driver does not support AP Mode therefore no beacons need to be send. Remove unused interrupt for IMR_BcnInt.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 37 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 1 insertion(+), 39 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -1
@@ -1802,7 +1802,7 @@ rtl92e_init_variables(struct net_device *dev)IMR_MGNTDOK |IMR_COMDOK |IMR_HIGHDOK |IMR_BDOK |IMR_RXCMDOK |IMR_TIMEOUT0 |IMR_RDU |IMR_RXFOVW |IMR_TXFOVW | - IMR_BcnInt | IMR_TBDOK | IMR_TBDER); + IMR_TBDOK | IMR_TBDER); priv->bfirst_after_down = false; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -37
@@ -416,38 +416,6 @@ static int _rtl92e_handle_assoc_response(struct net_device *dev,return 0 ; } -static void _rtl92e_prepare_beacon (struct tasklet_struct *t) -{ -struct r8192_priv *priv =from_tasklet (priv, t, - irq_prepare_beacon_tasklet); -struct net_device *dev = priv->rtllib->dev; -struct sk_buff *pskb =NULL , *pnewskb =NULL ; -struct cb_desc *tcb_desc =NULL ; -struct rtl8192_tx_ring *ring =NULL ; -struct tx_desc *pdesc =NULL ; - - ring = &priv->tx_ring[BEACON_QUEUE ]; - pskb =__skb_dequeue (&ring->queue); -kfree_skb (pskb); - - pnewskb =rtllib_get_beacon (priv->rtllib); -if (!pnewskb) -return ; - - tcb_desc = (struct cb_desc *)(pnewskb->cb +8 ); - tcb_desc->queue_index =BEACON_QUEUE ; - tcb_desc->data_rate =2 ; - tcb_desc->ratr_index =7 ; - tcb_desc->tx_dis_rate_fallback =1 ; - tcb_desc->tx_use_drv_assinged_rate =1 ; -skb_push (pnewskb, priv->rtllib->tx_headroom); - - pdesc = &ring->desc[0 ]; -rtl92e_fill_tx_desc (dev, pdesc, tcb_desc, pnewskb); -__skb_queue_tail (&ring->queue, pnewskb); - pdesc->OWN =1 ; -} -void rtl92e_config_rate (struct net_device *dev,u16 *rate_config) {struct r8192_priv *priv =rtllib_priv (dev);
@@ -785,8 +753,6 @@ static void _rtl92e_init_priv_task(struct net_device *dev)INIT_DELAYED_WORK (&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq);tasklet_setup (&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet);tasklet_setup (&priv->irq_tx_tasklet, _rtl92e_irq_tx_tasklet); -tasklet_setup (&priv->irq_prepare_beacon_tasklet, - _rtl92e_prepare_beacon); }static short _rtl92e_get_channel_map (struct net_device *dev)
@@ -1810,9 +1776,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)if (inta &IMR_ROK )tasklet_schedule (&priv->irq_rx_tasklet); -if (inta & IMR_BcnInt) -tasklet_schedule (&priv->irq_prepare_beacon_tasklet); -if (inta &IMR_RDU ) {rtl92e_writel (dev,INTA_MASK ,rtl92e_readl (dev,INTA_MASK ) & ~IMR_RDU );
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -219,7 +219,6 @@ struct r8192_priv {struct tasklet_struct irq_rx_tasklet;struct tasklet_struct irq_tx_tasklet; -struct tasklet_struct irq_prepare_beacon_tasklet;struct mutex wx_mutex;struct mutex rf_mutex;
Signature · 1 line
2.42.0
PATCH 2/8 staging: rtl8192e: Remove unused function rtllib_get_beacon()
In reply to Philipp HortmannRemove unused function rtllib_get_beacon().
--- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 21 --------------------- 2 files changed, 22 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -1693,7 +1693,6 @@ void rtllib_softmac_start_protocol(struct rtllib_device *ieee);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 notify_wx_assoc_event (struct rtllib_device *ieee);void rtllib_ps_tx_ack (struct rtllib_device *ieee,short success);
drivers/staging/rtl8192e/rtllib_softmac.c +0 -21
@@ -2180,27 +2180,6 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee)return skb; } -struct sk_buff *rtllib_get_beacon (struct rtllib_device *ieee) -{ -struct sk_buff *skb; -struct rtllib_probe_response *b; - - skb =rtllib_get_beacon_ (ieee); -if (!skb) -return NULL ; - - b = (struct rtllib_probe_response *)skb->data; - b->header.seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 ); - -if (ieee->seq_ctrl[0 ] ==0xFFF ) - ieee->seq_ctrl[0 ] =0 ; -else - ieee->seq_ctrl[0 ]++; - -return skb; -} -EXPORT_SYMBOL (rtllib_get_beacon); -void rtllib_softmac_stop_protocol (struct rtllib_device *ieee) {rtllib_stop_scan_syncro (ieee);
Signature · 1 line
2.42.0
PATCH 3/8 staging: rtl8192e: Remove unused timer beacon_timer
In reply to Philipp HortmannDriver does not support AP Mode therefore no beacons need to be send. Remove unused timer beacon_timer.
--- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 17 ----------------- 2 files changed, 18 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -1418,7 +1418,6 @@ struct rtllib_device {struct timer_list associate_timer;/* used if IEEE_SOFTMAC_BEACONS is set */ -struct timer_list beacon_timer;u8 need_sw_enc;struct work_struct associate_complete_wq;struct work_struct ips_leave_wq;
drivers/staging/rtl8192e/rtllib_softmac.c +0 -17
@@ -365,21 +365,6 @@ static void rtllib_send_beacon(struct rtllib_device *ieee)softmac_mgmt_xmit (skb, ieee); ieee->softmac_stats.tx_beacons++; } - -if (ieee->beacon_txing && ieee->ieee_up) -mod_timer (&ieee->beacon_timer, jiffies + - (msecs_to_jiffies (ieee->current_network.beacon_interval -5 ))); -} - -static void rtllib_send_beacon_cb (struct timer_list *t) -{ -struct rtllib_device *ieee = -from_timer (ieee, t, beacon_timer); -unsigned long flags; - -spin_lock_irqsave (&ieee->beacon_lock, flags); -rtllib_send_beacon (ieee); -spin_unlock_irqrestore (&ieee->beacon_lock, flags); }/* Enables network monitor mode, all rx packets will be received. */
@@ -2328,8 +2313,6 @@ int rtllib_softmac_init(struct rtllib_device *ieee)timer_setup (&ieee->associate_timer, rtllib_associate_abort_cb,0 ); -timer_setup (&ieee->beacon_timer, rtllib_send_beacon_cb,0 ); -INIT_DELAYED_WORK (&ieee->link_change_wq, (void *)rtllib_link_change_wq);INIT_WORK (&ieee->associate_complete_wq, (void *)rtllib_associate_complete_wq);INIT_DELAYED_WORK (&ieee->associate_procedure_wq, (void *)rtllib_associate_procedure_wq);
Signature · 1 line
2.42.0
PATCH 4/8 staging: rtl8192e: Remove unused function rtllib_send_beacon()
In reply to Philipp HortmannRemove unused function rtllib_send_beacon().
--- drivers/staging/rtl8192e/rtllib_softmac.c | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +0 -16
@@ -351,22 +351,6 @@ static inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee)return skb; } -static struct sk_buff *rtllib_get_beacon_ (struct rtllib_device *ieee); - -static void rtllib_send_beacon (struct rtllib_device *ieee) -{ -struct sk_buff *skb; - -if (!ieee->ieee_up) -return ; - skb =rtllib_get_beacon_ (ieee); - -if (skb) { -softmac_mgmt_xmit (skb, ieee); - ieee->softmac_stats.tx_beacons++; - } -} -/* Enables network monitor mode, all rx packets will be received. */ void rtllib_EnableNetMonitorMode (struct net_device *dev,bool bInitState)
Signature · 1 line
2.42.0
PATCH 5/8 staging: rtl8192e: Remove unused function rtllib_get_beacon_()
In reply to Philipp HortmannRemove unused function rtllib_get_beacon_().
--- drivers/staging/rtl8192e/rtllib_softmac.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +0 -19
@@ -2130,25 +2130,6 @@ static void rtllib_associate_retry_wq(void *data)mutex_unlock (&ieee->wx_mutex); } -static struct sk_buff *rtllib_get_beacon_ (struct rtllib_device *ieee) -{ -static const u8 broadcast_addr[] = { -0xff ,0xff ,0xff ,0xff ,0xff ,0xff - }; -struct sk_buff *skb; -struct rtllib_probe_response *b; - - skb =rtllib_probe_resp (ieee, broadcast_addr); - -if (!skb) -return NULL ; - - b = (struct rtllib_probe_response *)skb->data; - b->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_BEACON ); - -return skb; -} -void rtllib_softmac_stop_protocol (struct rtllib_device *ieee) {rtllib_stop_scan_syncro (ieee);
Signature · 1 line
2.42.0
PATCH 6/8 staging: rtl8192e: Remove unused function rtllib_probe_resp()
In reply to Philipp HortmannRemove unused function rtllib_probe_resp().
--- drivers/staging/rtl8192e/rtllib_softmac.c | 146 ---------------------- 1 file changed, 146 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +0 -146
@@ -632,152 +632,6 @@ rtllib_authentication_req(struct rtllib_network *beacon,return skb; } -static struct sk_buff *rtllib_probe_resp (struct rtllib_device *ieee, -const u8 *dest) -{ -u8 *tag; -int beacon_size; -struct rtllib_probe_response *beacon_buf; -struct sk_buff *skb =NULL ; -int encrypt; -int atim_len, erp_len; -struct lib80211_crypt_data *crypt; - -char *ssid = ieee->current_network.ssid; -int ssid_len = ieee->current_network.ssid_len; -int rate_len = ieee->current_network.rates_len +2 ; -int rate_ex_len = ieee->current_network.rates_ex_len; -int wpa_ie_len = ieee->wpa_ie_len; -u8 erpinfo_content =0 ; - -u8 *tmp_ht_cap_buf =NULL ; -u8 tmp_ht_cap_len =0 ; -u8 *tmp_ht_info_buf =NULL ; -u8 tmp_ht_info_len =0 ; -struct rt_hi_throughput *ht_info = ieee->ht_info; -u8 *tmp_generic_ie_buf =NULL ; -u8 tmp_generic_ie_len =0 ; - -if (rate_ex_len >0 ) - rate_ex_len +=2 ; - -if (ieee->current_network.capability &WLAN_CAPABILITY_IBSS ) - atim_len =4 ; -else - atim_len =0 ; - -if ((ieee->current_network.mode ==WIRELESS_MODE_G ) || - (ieee->current_network.mode ==WIRELESS_MODE_N_24G && - ieee->ht_info->bCurSuppCCK)) { - erp_len =3 ; - erpinfo_content =0 ; -if (ieee->current_network.buseprotection) - erpinfo_content |= ERP_UseProtection; - }else { - erp_len =0 ; - } - - crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; - encrypt = crypt && crypt->ops && - ((strcmp (crypt->ops->name,"R-WEP" ) ==0 || wpa_ie_len)); -if (ieee->ht_info->current_ht_support) { - tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap); - tmp_ht_cap_len =sizeof (ieee->ht_info->SelfHTCap); - tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo); - tmp_ht_info_len =sizeof (ieee->ht_info->SelfHTInfo); -HTConstructCapabilityElement (ieee, tmp_ht_cap_buf, - &tmp_ht_cap_len, encrypt, false); -HTConstructInfoElement (ieee, tmp_ht_info_buf, &tmp_ht_info_len, - encrypt); - -if (ht_info->reg_rt2rt_aggregation) { - tmp_generic_ie_buf = ieee->ht_info->sz_rt2rt_agg_buf; - tmp_generic_ie_len = -sizeof (ieee->ht_info->sz_rt2rt_agg_buf); -HTConstructRT2RTAggElement (ieee, tmp_generic_ie_buf, - &tmp_generic_ie_len); - } - } - - beacon_size =sizeof (struct rtllib_probe_response ) +2 + - ssid_len +3 + rate_len + rate_ex_len + atim_len + erp_len - + wpa_ie_len + ieee->tx_headroom; - skb =dev_alloc_skb (beacon_size); -if (!skb) -return NULL ; - -skb_reserve (skb, ieee->tx_headroom); - - beacon_buf =skb_put (skb, (beacon_size - ieee->tx_headroom)); -ether_addr_copy (beacon_buf->header.addr1, dest); -ether_addr_copy (beacon_buf->header.addr2, ieee->dev->dev_addr); -ether_addr_copy (beacon_buf->header.addr3, ieee->current_network.bssid); - - beacon_buf->header.duration_id =0 ; - beacon_buf->beacon_interval = -cpu_to_le16 (ieee->current_network.beacon_interval); - beacon_buf->capability = -cpu_to_le16 (ieee->current_network.capability & -WLAN_CAPABILITY_IBSS ); - beacon_buf->capability |= -cpu_to_le16 (ieee->current_network.capability & -WLAN_CAPABILITY_SHORT_PREAMBLE ); - -if (ieee->current_network.capability &WLAN_CAPABILITY_SHORT_SLOT_TIME ) - beacon_buf->capability |= -cpu_to_le16 (WLAN_CAPABILITY_SHORT_SLOT_TIME ); - - crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; -if (encrypt) - beacon_buf->capability |=cpu_to_le16 (WLAN_CAPABILITY_PRIVACY ); - - beacon_buf->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ); - beacon_buf->info_element[0 ].id =MFIE_TYPE_SSID ; - beacon_buf->info_element[0 ].len = ssid_len; - - tag = (u8 *)beacon_buf->info_element[0 ].data; - -memcpy (tag, ssid, ssid_len); - - tag += ssid_len; - - *(tag++) =MFIE_TYPE_RATES ; - *(tag++) = rate_len -2 ; -memcpy (tag, ieee->current_network.rates, rate_len -2 ); - tag += rate_len -2 ; - - *(tag++) =MFIE_TYPE_DS_SET ; - *(tag++) =1 ; - *(tag++) = ieee->current_network.channel; - -if (atim_len) { -u16 val16; - *(tag++) =MFIE_TYPE_IBSS_SET ; - *(tag++) =2 ; - val16 = ieee->current_network.atim_window; -memcpy ((u8 *)tag, (u8 *)&val16,2 ); - tag +=2 ; - } - -if (erp_len) { - *(tag++) =MFIE_TYPE_ERP ; - *(tag++) =1 ; - *(tag++) = erpinfo_content; - } -if (rate_ex_len) { - *(tag++) =MFIE_TYPE_RATES_EX ; - *(tag++) = rate_ex_len -2 ; -memcpy (tag, ieee->current_network.rates_ex, rate_ex_len -2 ); - tag += rate_ex_len -2 ; - } - -if (wpa_ie_len) { -memcpy (tag, ieee->wpa_ie, ieee->wpa_ie_len); - tag += ieee->wpa_ie_len; - } -return skb; -} -static struct sk_buff *rtllib_null_func (struct rtllib_device *ieee,short pwr) {struct sk_buff *skb;
Signature · 1 line
2.42.0
PATCH 7/8 staging: rtl8192e: Remove unused function HTConstructInfoElement()
In reply to Philipp HortmannRemove unused function HTConstructInfoElement().
--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ---------------- drivers/staging/rtl8192e/rtllib.h | 2 -- 2 files changed, 18 deletions(-)
drivers/staging/rtl8192e/rtl819x_HTProc.c +0 -16
@@ -328,22 +328,6 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, } } -void HTConstructInfoElement (struct rtllib_device *ieee,u8 *posHTInfo, -u8 *len,u8 IsEncrypt) -{ -struct ht_info_ele *pHTInfoEle = (struct ht_info_ele *)posHTInfo; - -if (!posHTInfo || !pHTInfoEle) { -netdev_warn (ieee->dev, -"%s(): posHTInfo and pHTInfoEle are null\n" , - __func__); -return ; - } - -memset (posHTInfo,0 , *len); - *len =0 ; -} -void HTConstructRT2RTAggElement (struct rtllib_device *ieee,u8 *posRT2RTAgg,u8 *len) {
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -1760,8 +1760,6 @@ void ht_update_default_setting(struct rtllib_device *ieee);void HTConstructCapabilityElement (struct rtllib_device *ieee,u8 *posHTCap,u8 *len,u8 isEncrypt,bool bAssoc); -void HTConstructInfoElement (struct rtllib_device *ieee, -u8 *posHTInfo,u8 *len,u8 isEncrypt);void HTConstructRT2RTAggElement (struct rtllib_device *ieee,u8 *posRT2RTAgg,u8 *len);void HTOnAssocRsp (struct rtllib_device *ieee);
Signature · 1 line
2.42.0
PATCH 8/8 staging: rtl8192e: Remove function rtl92e_update_rx_pkt_timestamp()
In reply to Philipp Hortmannmac_time and last_rx_desc_tsf are only used in rtl92e_update_rx_pkt_timestamp(). Depending on a condition one is equal to the other or vice versa. But since those are not used anywhere else the function rtl92e_update_rx_pkt_timestamp() is just dead code.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 11 ----------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- drivers/staging/rtl8192e/rtllib.h | 1 - 4 files changed, 18 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -2
@@ -1673,8 +1673,6 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats, stats->TimeStampLow = pDrvInfo->TSFL; stats->TimeStampHigh =rtl92e_readl (dev,TSFR +4 ); -rtl92e_update_rx_pkt_timestamp (dev, stats); -if ((stats->RxBufShift + stats->RxDrvInfoSize) >0 ) stats->bShift =1 ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -11
@@ -1433,17 +1433,6 @@ void rtl92e_reset_desc_ring(struct net_device *dev)spin_unlock_irqrestore (&priv->irq_th_lock, flags); } -void rtl92e_update_rx_pkt_timestamp (struct net_device *dev, -struct rtllib_rx_stats *stats) -{ -struct r8192_priv *priv =rtllib_priv (dev); - -if (stats->bIsAMPDU && !stats->bFirstMPDU) - stats->mac_time = priv->last_rx_desc_tsf; -else - priv->last_rx_desc_tsf = stats->mac_time; -} -long rtl92e_translate_to_dbm (struct r8192_priv *priv,u8 signal_strength_index) {long signal_power;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -4
@@ -234,8 +234,6 @@ struct r8192_priv {int rxringcount;u16 rxbuffersize; -u64 last_rx_desc_tsf; -u32 receive_config;u8 retry_data;u8 retry_rts;
@@ -391,8 +389,6 @@ void rtl92e_irq_enable(struct net_device *dev);void rtl92e_config_rate (struct net_device *dev,u16 *rate_config);void rtl92e_irq_disable (struct net_device *dev); -void rtl92e_update_rx_pkt_timestamp (struct net_device *dev, -struct rtllib_rx_stats *stats);long rtl92e_translate_to_dbm (struct r8192_priv *priv,u8 signal_strength_index);void rtl92e_update_rx_statistics (struct r8192_priv *priv,struct rtllib_rx_stats *pprevious_stats);
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -471,7 +471,6 @@ enum _REG_PREAMBLE_MODE {* any adverse affects. */ struct rtllib_rx_stats { -u64 mac_time;s8 rssi;u8 signal;u8 noise;
Signature · 1 line
2.42.0