preparations for stations per vif
Johannes Berg
maintainercover preparations for stations per vif
On my quest to make stations in mac80211 per virtual interface, I found a few things that I need to prepare to be able to understand and modify easier.
Thus this patchset.
johannes
Johannes Berg
maintainerPATCH 1/4 mac80211: let sta_info_get_by_idx get sta by sdata
Instead of filtering by device, directly look up by sdata.
--- net/mac80211/cfg.c | 4 ++-- net/mac80211/sta_info.c | 7 ++++--- net/mac80211/sta_info.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-)
net/mac80211/cfg.c +2 -2
@@ -398,13 +398,13 @@ static void sta_set_sinfo(struct sta_infstatic int ieee80211_dump_station (struct wiphy *wiphy,struct net_device *dev,int idx,u8 *mac,struct station_info *sinfo) { -struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr); +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct sta_info *sta;int ret = -ENOENT ;rcu_read_lock (); - sta =sta_info_get_by_idx (local, idx, dev); + sta =sta_info_get_by_idx (sdata, idx);if (sta) { ret =0 ;memcpy (mac, sta->sta.addr,ETH_ALEN );
net/mac80211/sta_info.c +4 -3
@@ -116,14 +116,15 @@ struct sta_info *sta_info_get(struct ieereturn sta; } -struct sta_info *sta_info_get_by_idx (struct ieee80211_local *local,int idx, -struct net_device *dev) +struct sta_info *sta_info_get_by_idx (struct ieee80211_sub_if_data *sdata, +int idx) { +struct ieee80211_local *local = sdata->local;struct sta_info *sta;int i =0 ;list_for_each_entry_rcu (sta, &local->sta_list, list) { -if (dev && dev != sta->sdata->dev) +if (sdata != sta->sdata)continue ;if (i < idx) { ++i;
net/mac80211/sta_info.h +2 -2
@@ -409,8 +409,8 @@ struct sta_info *sta_info_get(struct iee/* * Get STA info by index, BROKEN! */ -struct sta_info *sta_info_get_by_idx (struct ieee80211_local *local,int idx, -struct net_device *dev); +struct sta_info *sta_info_get_by_idx (struct ieee80211_sub_if_data *sdata, +int idx);/* * Create a new STA info, caller owns returned structure * until sta_info_insert().
Johannes Berg
maintainerPATCH 2/4 mac80211: convert aggregation to operate on vifs/stas
In reply to Johannes BergThe entire aggregation code currently operates on the hw pointer and station addresses, but that needs to change to make stations purely per-vif; As one step preparing for that make the aggregation code callable with the station, or by the combination of virtual interface and station address.
--- drivers/net/wireless/ath/ar9170/main.c | 5 - drivers/net/wireless/ath/ath9k/main.c | 5 - drivers/net/wireless/ath/ath9k/rc.c | 2 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 drivers/net/wireless/iwlwifi/iwl-agn.c | 1 drivers/net/wireless/iwlwifi/iwl-tx.c | 8 +- include/net/mac80211.h | 28 ++++---- net/mac80211/agg-rx.c | 6 + net/mac80211/agg-tx.c | 96 +++++++++++------------------- net/mac80211/driver-ops.h | 5 - net/mac80211/driver-trace.h | 9 +- net/mac80211/ht.c | 3 net/mac80211/ieee80211_i.h | 3 net/mac80211/main.c | 8 +- 14 files changed, 84 insertions(+), 97 deletions(-)
include/net/mac80211.h +13 -15
@@ -1519,6 +1519,7 @@ struct ieee80211_ops {void (*reset_tsf)(struct ieee80211_hw *hw);int (*tx_last_beacon)(struct ieee80211_hw *hw);int (*ampdu_action)(struct ieee80211_hw *hw, +struct ieee80211_vif *vif,enum ieee80211_ampdu_mlme_action action,struct ieee80211_sta *sta,u16 tid,u16 *ssn);
@@ -2040,8 +2041,7 @@ void ieee80211_queue_delayed_work(struct/** * ieee80211_start_tx_ba_session - Start a tx Block Ack session. -* @hw: pointer as obtained from ieee80211_alloc_hw(). -* @ra: receiver address of the BA session recipient +* @sta: the station for which to start a BA session * @tid: the TID to BA on. * * Return: success if addBA request was sent, failure otherwise
@@ -2050,22 +2050,22 @@ void ieee80211_queue_delayed_work(struct* the need to start aggregation on a certain RA/TID, the session level * will be managed by the mac80211. */ -int ieee80211_start_tx_ba_session (struct ieee80211_hw *hw,u8 *ra,u16 tid); +int ieee80211_start_tx_ba_session (struct ieee80211_sta *sta,u16 tid);/** * ieee80211_start_tx_ba_cb - low level driver ready to aggregate. -* @hw: pointer as obtained from ieee80211_alloc_hw(). +* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf * @ra: receiver address of the BA session recipient. * @tid: the TID to BA on. * * This function must be called by low level driver once it has * finished with preparations for the BA session. */ -void ieee80211_start_tx_ba_cb (struct ieee80211_hw *hw,u8 *ra,u16 tid); +void ieee80211_start_tx_ba_cb (struct ieee80211_vif *vif,u8 *ra,u16 tid);/** * ieee80211_start_tx_ba_cb_irqsafe - low level driver ready to aggregate. -* @hw: pointer as obtained from ieee80211_alloc_hw(). +* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf * @ra: receiver address of the BA session recipient. * @tid: the TID to BA on. *
@@ -2073,13 +2073,12 @@ void ieee80211_start_tx_ba_cb(struct iee* finished with preparations for the BA session. * This version of the function is IRQ-safe. */ -void ieee80211_start_tx_ba_cb_irqsafe (struct ieee80211_hw *hw,const u8 *ra, +void ieee80211_start_tx_ba_cb_irqsafe (struct ieee80211_vif *vif,const u8 *ra,u16 tid);/** * ieee80211_stop_tx_ba_session - Stop a Block Ack session. -* @hw: pointer as obtained from ieee80211_alloc_hw(). -* @ra: receiver address of the BA session recipient +* @sta: the station whose BA session to stop * @tid: the TID to stop BA. * @initiator: if indicates initiator DELBA frame will be sent. *
@@ -2089,24 +2088,23 @@ void ieee80211_start_tx_ba_cb_irqsafe(st* the need to stop aggregation on a certain RA/TID, the session level * will be managed by the mac80211. */ -int ieee80211_stop_tx_ba_session (struct ieee80211_hw *hw, -u8 *ra,u16 tid, +int ieee80211_stop_tx_ba_session (struct ieee80211_sta *sta,u16 tid,enum ieee80211_back_parties initiator);/** * ieee80211_stop_tx_ba_cb - low level driver ready to stop aggregate. -* @hw: pointer as obtained from ieee80211_alloc_hw(). +* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf * @ra: receiver address of the BA session recipient. * @tid: the desired TID to BA on. * * This function must be called by low level driver once it has * finished with preparations for the BA session tear down. */ -void ieee80211_stop_tx_ba_cb (struct ieee80211_hw *hw,u8 *ra,u8 tid); +void ieee80211_stop_tx_ba_cb (struct ieee80211_vif *vif,u8 *ra,u8 tid);/** * ieee80211_stop_tx_ba_cb_irqsafe - low level driver ready to stop aggregate. -* @hw: pointer as obtained from ieee80211_alloc_hw(). +* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf * @ra: receiver address of the BA session recipient. * @tid: the desired TID to BA on. *
@@ -2114,7 +2112,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee* finished with preparations for the BA session tear down. * This version of the function is IRQ-safe. */ -void ieee80211_stop_tx_ba_cb_irqsafe (struct ieee80211_hw *hw,const u8 *ra, +void ieee80211_stop_tx_ba_cb_irqsafe (struct ieee80211_vif *vif,const u8 *ra,u16 tid);/**
net/mac80211/agg-tx.c +38 -58
206 lines not on this page · raw message
net/mac80211/ieee80211_i.h +2 -1
@@ -770,8 +770,9 @@ IEEE80211_DEV_TO_SUB_IF(struct net_devicreturn netdev_priv (dev); } -/* this struct represents 802.11n's RA/TID combination */ +/* this struct represents 802.11n's RA/TID combination along with our vif */ struct ieee80211_ra_tid { +struct ieee80211_vif *vif;u8 ra[ETH_ALEN ];u16 tid; };
net/mac80211/main.c +4 -4
@@ -296,14 +296,14 @@ static void ieee80211_tasklet_handler(unbreak ;case IEEE80211_DELBA_MSG : ra_tid = (struct ieee80211_ra_tid *) &skb->cb; -ieee80211_stop_tx_ba_cb (local_to_hw (local), - ra_tid->ra, ra_tid->tid); +ieee80211_stop_tx_ba_cb (ra_tid->vif, ra_tid->ra, + ra_tid->tid);dev_kfree_skb (skb);break ;case IEEE80211_ADDBA_MSG : ra_tid = (struct ieee80211_ra_tid *) &skb->cb; -ieee80211_start_tx_ba_cb (local_to_hw (local), - ra_tid->ra, ra_tid->tid); +ieee80211_start_tx_ba_cb (ra_tid->vif, ra_tid->ra, + ra_tid->tid);dev_kfree_skb (skb);break ;default :
net/mac80211/ht.c +1 -2
@@ -141,7 +141,6 @@ void ieee80211_process_delba(struct ieeestruct sta_info *sta, struct ieee80211_mgmt *mgmt, size_t len) { - struct ieee80211_local *local = sdata->local; u16 tid, params;u16 initiator;
@@ -164,7 +163,7 @@ void ieee80211_process_delba(struct ieee sta->ampdu_mlme.tid_state_tx[tid] =HT_AGG_STATE_OPERATIONAL ;spin_unlock_bh (&sta->lock); -ieee80211_stop_tx_ba_session (&local->hw, sta->sta.addr, tid, +ieee80211_stop_tx_ba_session (&sta->sta, tid,WLAN_BACK_RECIPIENT ); } }
drivers/net/wireless/ath/ar9170/main.c +3 -2
@@ -2441,6 +2441,7 @@ static int ar9170_conf_tx(struct ieee802 }static int ar9170_ampdu_action (struct ieee80211_hw *hw, +struct ieee80211_vif *vif,enum ieee80211_ampdu_mlme_action action,struct ieee80211_sta *sta,u16 tid,u16 *ssn) {
@@ -2470,7 +2471,7 @@ static int ar9170_ampdu_action(struct ie tid_info->state =AR9170_TID_STATE_PROGRESS ; tid_info->active = false;spin_unlock_irqrestore (&ar->tx_ampdu_list_lock, flags); -ieee80211_start_tx_ba_cb_irqsafe (hw, sta->addr, tid); +ieee80211_start_tx_ba_cb_irqsafe (vif, sta->addr, tid);break ;case IEEE80211_AMPDU_TX_STOP :
@@ -2480,7 +2481,7 @@ static int ar9170_ampdu_action(struct ie tid_info->active = false;skb_queue_purge (&tid_info->queue);spin_unlock_irqrestore (&ar->tx_ampdu_list_lock, flags); -ieee80211_stop_tx_ba_cb_irqsafe (hw, sta->addr, tid); +ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);break ;case IEEE80211_AMPDU_TX_OPERATIONAL :
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +1 -1
@@ -301,7 +301,7 @@ static void rs_tl_turn_on_agg_for_tid(stif (rs_tl_get_load (lq_data, tid) >IWL_AGG_LOAD_THRESHOLD ) {IWL_DEBUG_HT (priv,"Starting Tx agg: STA: %pM tid: %d\n" , sta->addr, tid); -ieee80211_start_tx_ba_session (priv->hw, sta->addr, tid); +ieee80211_start_tx_ba_session (sta, tid); } }
drivers/net/wireless/iwlwifi/iwl-tx.c +4 -4
@@ -1264,7 +1264,7 @@ int iwl_tx_agg_start(struct iwl_priv *prif (tid_data->tfds_in_queue ==0 ) {IWL_DEBUG_HT (priv,"HW queue is empty\n" ); tid_data->agg.state =IWL_AGG_ON ; -ieee80211_start_tx_ba_cb_irqsafe (priv->hw, ra, tid); +ieee80211_start_tx_ba_cb_irqsafe (priv->vif, ra, tid); }else {IWL_DEBUG_HT (priv,"HW queue is NOT empty: %d packets in HW queue\n" , tid_data->tfds_in_queue);
@@ -1329,7 +1329,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priif (ret)return ret; -ieee80211_stop_tx_ba_cb_irqsafe (priv->hw, ra, tid); +ieee80211_stop_tx_ba_cb_irqsafe (priv->vif, ra, tid);return 0 ; }
@@ -1353,7 +1353,7 @@ int iwl_txq_check_empty(struct iwl_priv priv->cfg->ops->lib->txq_agg_disable (priv, txq_id, ssn, tx_fifo); tid_data->agg.state =IWL_AGG_OFF ; -ieee80211_stop_tx_ba_cb_irqsafe (priv->hw, addr, tid); +ieee80211_stop_tx_ba_cb_irqsafe (priv->vif, addr, tid); }break ;case IWL_EMPTYING_HW_QUEUE_ADDBA :
@@ -1361,7 +1361,7 @@ int iwl_txq_check_empty(struct iwl_privif (tid_data->tfds_in_queue ==0 ) {IWL_DEBUG_HT (priv,"HW queue empty: continue ADDBA flow\n" ); tid_data->agg.state =IWL_AGG_ON ; -ieee80211_start_tx_ba_cb_irqsafe (priv->hw, addr, tid); +ieee80211_start_tx_ba_cb_irqsafe (priv->vif, addr, tid); }break ; }
net/mac80211/driver-ops.h +3 -2
@@ -239,15 +239,16 @@ static inline int drv_tx_last_beacon(str }static inline int drv_ampdu_action (struct ieee80211_local *local, +struct ieee80211_vif *vif,enum ieee80211_ampdu_mlme_action action,struct ieee80211_sta *sta,u16 tid,u16 *ssn) {int ret = -EOPNOTSUPP ;if (local->ops->ampdu_action) - ret = local->ops->ampdu_action (&local->hw, action, + ret = local->ops->ampdu_action (&local->hw, vif, action, sta, tid, ssn); -trace_drv_ampdu_action (local, action, sta, tid, ssn, ret); +trace_drv_ampdu_action (local, vif, action, sta, tid, ssn, ret);return ret; }
net/mac80211/driver-trace.h +6 -3
@@ -634,11 +634,12 @@ TRACE_EVENT(drv_tx_last_beacon, TRACE_EVENT(drv_ampdu_action, TP_PROTO(struct ieee80211_local *local, + struct ieee80211_vif *vif, enum ieee80211_ampdu_mlme_action action, struct ieee80211_sta *sta, u16 tid, u16 *ssn, int ret), - TP_ARGS(local, action, sta, tid, ssn, ret), + TP_ARGS(local, vif, action, sta, tid, ssn, ret), TP_STRUCT__entry( LOCAL_ENTRY
@@ -647,10 +648,12 @@ TRACE_EVENT(drv_ampdu_action, __field(u16, tid) __field(u16, ssn)__field (int, ret) + VIF_ENTRY ),TP_fast_assign ( LOCAL_ASSIGN; +VIF_ASSIGN ;STA_ASSIGN ; __entry->ret = ret; __entry->action = action;
@@ -659,8 +662,8 @@ TRACE_EVENT(drv_ampdu_action, ), TP_printk( - LOCAL_PR_FMT STA_PR_FMT " action:%d tid:%d ret:%d", -LOCAL_PR_ARG ,STA_PR_ARG , __entry->action, __entry->tid, __entry->ret + LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d ret:%d", +LOCAL_PR_ARG ,VIF_PR_ARG ,STA_PR_ARG , __entry->action, __entry->tid, __entry->ret ) );#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
net/mac80211/agg-rx.c +4 -2
@@ -41,7 +41,8 @@ void __ieee80211_stop_rx_ba_session(stru sta->sta.addr, tid);#endif /* CONFIG_MAC80211_HT_DEBUG */ -if (drv_ampdu_action (local,IEEE80211_AMPDU_RX_STOP , +if (drv_ampdu_action (local, &sta->sdata->vif, +IEEE80211_AMPDU_RX_STOP , &sta->sta, tid,NULL ))printk (KERN_DEBUG "HW problem - can not stop rx " "aggregation for tid %d\n" , tid);
@@ -284,7 +285,8 @@ void ieee80211_process_addba_request(str goto end; } - ret =drv_ampdu_action (local,IEEE80211_AMPDU_RX_START , + ret =drv_ampdu_action (local, &sta->sdata->vif, +IEEE80211_AMPDU_RX_START , &sta->sta, tid, &start_seq_num);#ifdef CONFIG_MAC80211_HT_DEBUG printk (KERN_DEBUG "Rx A-MPDU request on tid %d result %d\n" , tid, ret);
drivers/net/wireless/ath/ath9k/main.c +3 -2
@@ -3118,6 +3118,7 @@ static void ath9k_reset_tsf(struct ieee8 }static int ath9k_ampdu_action (struct ieee80211_hw *hw, +struct ieee80211_vif *vif,enum ieee80211_ampdu_mlme_action action,struct ieee80211_sta *sta,u16 tid,u16 *ssn)
@@ -3135,11 +3136,11 @@ static int ath9k_ampdu_action(struct ieebreak ;case IEEE80211_AMPDU_TX_START :ath_tx_aggr_start (sc, sta, tid, ssn); -ieee80211_start_tx_ba_cb_irqsafe (hw, sta->addr, tid); +ieee80211_start_tx_ba_cb_irqsafe (vif, sta->addr, tid);break ;case IEEE80211_AMPDU_TX_STOP :ath_tx_aggr_stop (sc, sta, tid); -ieee80211_stop_tx_ba_cb_irqsafe (hw, sta->addr, tid); +ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);break ;case IEEE80211_AMPDU_TX_OPERATIONAL :ath_tx_aggr_resume (sc, sta, tid);
drivers/net/wireless/iwlwifi/iwl-agn.c +1 -0
@@ -2646,6 +2646,7 @@ static int iwl_mac_set_key(struct ieee80 }static int iwl_mac_ampdu_action (struct ieee80211_hw *hw, +struct ieee80211_vif *vif,enum ieee80211_ampdu_mlme_action action,struct ieee80211_sta *sta,u16 tid,u16 *ssn) {
drivers/net/wireless/ath/ath9k/rc.c +1 -1
@@ -1352,7 +1352,7 @@ static void ath_tx_status(void *priv, st an = (struct ath_node *)sta->drv_priv;if (ath_tx_aggr_check (sc, an, tid)) -ieee80211_start_tx_ba_session (sc->hw, hdr->addr1, tid); +ieee80211_start_tx_ba_session (sta, tid); } }
Johannes Berg
maintainerPATCH 3/4 mac80211: push michael MIC report after DA check
In reply to Johannes BergWhen we receive a michael MIC failure report from the hardware we currently do not check whether it is actually reported on a frame that is destined to us. It shouldn't be possible to get a michael MIC failure report on other frames, but it also doesn't hurt to verify.
Also, since we then don't need the station struct that early, move looking it up a bit later in the RX path.
Finally, while at it, a few code cleanups in the area.
--- net/mac80211/rx.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-)
net/mac80211/rx.c +23 -24
@@ -1818,11 +1818,11 @@ static void ieee80211_rx_michael_mic_rep* Some hardware seem to generate incorrect Michael MIC * reports; ignore them to avoid triggering countermeasures. */ - goto ignore; +return ; }if (!ieee80211_has_protected (hdr->frame_control)) - goto ignore; +return ;if (rx->sdata->vif.type ==NL80211_IFTYPE_AP && keyidx) {/*
@@ -1831,18 +1831,15 @@ static void ieee80211_rx_michael_mic_rep* group keys and only the AP is sending real multicast * frames in the BSS. */ - goto ignore; +return ; }if (!ieee80211_is_data (hdr->frame_control) && !ieee80211_is_auth (hdr->frame_control)) - goto ignore; +return ;mac80211_ev_michael_mic_failure (rx->sdata, keyidx, hdr,NULL ,GFP_ATOMIC ); - ignore: -dev_kfree_skb (rx->skb); - rx->skb =NULL ; }/* TODO: use IEEE80211_RX_FRAGMENTED */
@@ -2064,8 +2061,6 @@ static int prepare_for_handlers(struct ireturn 0 ;break ;case NL80211_IFTYPE_MONITOR : -/* take everything */ -break ;case NL80211_IFTYPE_UNSPECIFIED :case __NL80211_IFTYPE_AFTER_LAST:/* should never get here */
@@ -2097,24 +2092,12 @@ static void __ieee80211_rx_handle_packetmemset (&rx,0 ,sizeof (rx)); rx.skb = skb; rx.local = local; - rx.status = status; rx.rate = rate;if (ieee80211_is_data (hdr->frame_control) ||ieee80211_is_mgmt (hdr->frame_control)) local->dot11ReceivedFragmentCount++; - rx.sta =sta_info_get (local, hdr->addr2); -if (rx.sta) { - rx.sdata = rx.sta->sdata; - rx.dev = rx.sta->sdata->dev; - } - -if ((status->flag &RX_FLAG_MMIC_ERROR )) { -ieee80211_rx_michael_mic_report (hdr, &rx); -return ; - } -if (unlikely (test_bit (SCAN_HW_SCANNING , &local->scanning) ||test_bit (SCAN_OFF_CHANNEL , &local->scanning))) rx.flags |=IEEE80211_RX_IN_SCAN ;
@@ -2122,13 +2105,22 @@ static void __ieee80211_rx_handle_packetieee80211_parse_qos (&rx);ieee80211_verify_alignment (&rx); - skb = rx.skb; + rx.sta =sta_info_get (local, hdr->addr2); +if (rx.sta) { + rx.sdata = rx.sta->sdata; + rx.dev = rx.sta->sdata->dev; + }if (rx.sdata &&ieee80211_is_data (hdr->frame_control)) { rx.flags |=IEEE80211_RX_RA_MATCH ; prepares =prepare_for_handlers (rx.sdata, &rx, hdr); -if (prepares) - prev = rx.sdata; +if (prepares) { +if (status->flag &RX_FLAG_MMIC_ERROR ) { +if (rx.flags &IEEE80211_RX_RA_MATCH ) +ieee80211_rx_michael_mic_report (hdr, &rx); + }else + prev = rx.sdata; + } } else list_for_each_entry_rcu(sdata, &local->interfaces, list) {if (!netif_running (sdata->dev))continue ;
@@ -2143,6 +2135,13 @@ static void __ieee80211_rx_handle_packetif (!prepares)continue ; +if (status->flag &RX_FLAG_MMIC_ERROR ) { + rx.sdata = sdata; +if (rx.flags &IEEE80211_RX_RA_MATCH ) +ieee80211_rx_michael_mic_report (hdr, &rx); +continue ; + } +/* * frame is destined for this interface, but if it's not * also for the previous one we handle that after the
Johannes Berg
maintainerPATCH 4/4 mac80211: cleanup reorder buffer handling
In reply to Johannes BergThe reorder buffer handling is written in a quite peculiar style (especially comments) and also has a quirk where it invokes the entire reorder code in ieee80211_sta_manage_reorder_buf() for just a handful of lines in it with a special argument.
Split out ieee80211_release_reorder_frames which can then be invoked from BAR handling and other reordering code, clean up code and comments and remove function arguments that are now unused from ieee80211_sta_manage_reorder_buf().
--- net/mac80211/rx.c | 162 +++++++++++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 81 deletions(-)
net/mac80211/rx.c +81 -81
@@ -27,11 +27,10 @@#include "tkip.h" #include "wme.h" -static u8 ieee80211_sta_manage_reorder_buf (struct ieee80211_hw *hw, -struct tid_ampdu_rx *tid_agg_rx, -struct sk_buff *skb, -u16 mpdu_seq_num, -int bar_req); +static void ieee80211_release_reorder_frames (struct ieee80211_hw *hw, +struct tid_ampdu_rx *tid_agg_rx, +u16 head_seq_num); +/* * monitor mode reception *
@@ -1592,11 +1591,11 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_if (ieee80211_is_back_req (bar->frame_control)) {if (!rx->sta) -return RX_CONTINUE ; +return RX_DROP_MONITOR ; tid =le16_to_cpu (bar->control) >>12 ;if (rx->sta->ampdu_mlme.tid_state_rx[tid] !=HT_AGG_STATE_OPERATIONAL ) -return RX_CONTINUE ; +return RX_DROP_MONITOR ; tid_agg_rx = rx->sta->ampdu_mlme.tid_rx[tid]; start_seq_num =le16_to_cpu (bar->start_seq_num) >>4 ;
@@ -1606,13 +1605,10 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_mod_timer (&tid_agg_rx->session_timer,TU_TO_EXP_TIME (tid_agg_rx->timeout)); -/* manage reordering buffer according to requested */ -/* sequence number */ -rcu_read_lock (); -ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx,NULL , - start_seq_num,1 ); -rcu_read_unlock (); -return RX_DROP_UNUSABLE ; +/* release stored frames up to start of BAR */ +ieee80211_release_reorder_frames (hw, tid_agg_rx, start_seq_num); +kfree_skb (skb); +return RX_QUEUED ; }return RX_CONTINUE ;
@@ -2223,6 +2219,18 @@ no_frame: tid_agg_rx->head_seq_num =seq_inc (tid_agg_rx->head_seq_num); } +static void ieee80211_release_reorder_frames (struct ieee80211_hw *hw, +struct tid_ampdu_rx *tid_agg_rx, +u16 head_seq_num) +{ +int index; + +while (seq_less (tid_agg_rx->head_seq_num, head_seq_num)) { + index =seq_sub (tid_agg_rx->head_seq_num, tid_agg_rx->ssn) % + tid_agg_rx->buf_size; +ieee80211_release_reorder_frame (hw, tid_agg_rx, index); + } +}/* * Timeout (in jiffies) for skb's that are waiting in the RX reorder buffer. If
@@ -2234,15 +2242,17 @@ no_frame:#define HT_RX_REORDER_BUF_TIMEOUT (HZ / 10)/* -* As it function blongs to Rx path it must be called with -* the proper rcu_read_lock protection for its flow. +* As this function belongs to the RX path it must be under +* rcu_read_lock protection. It returns false if the frame +* can be processed immediately, true if it was consumed. */ -static u8 ieee80211_sta_manage_reorder_buf (struct ieee80211_hw *hw, -struct tid_ampdu_rx *tid_agg_rx, -struct sk_buff *skb, -u16 mpdu_seq_num, -int bar_req) +static bool ieee80211_sta_manage_reorder_buf (struct ieee80211_hw *hw, +struct tid_ampdu_rx *tid_agg_rx, +struct sk_buff *skb) { +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; +u16 sc =le16_to_cpu (hdr->seq_ctrl); +u16 mpdu_seq_num = (sc &IEEE80211_SCTL_SEQ ) >>4 ;u16 head_seq_num, buf_size;int index;
@@ -2252,47 +2262,37 @@ static u8 ieee80211_sta_manage_reorder_b/* frame with out of date sequence number */ if (seq_less (mpdu_seq_num, head_seq_num)) {dev_kfree_skb (skb); -return 1 ; +return true; } -/* if frame sequence number exceeds our buffering window size or -* block Ack Request arrived - release stored frames */ -if ((!seq_less (mpdu_seq_num, head_seq_num + buf_size)) || (bar_req)) { -/* new head to the ordering buffer */ -if (bar_req) - head_seq_num = mpdu_seq_num; -else - head_seq_num = -seq_inc (seq_sub (mpdu_seq_num, buf_size)); +/* +* If frame the sequence number exceeds our buffering window +* size release some previous frames to make room for this one. +*/ +if (!seq_less (mpdu_seq_num, head_seq_num + buf_size)) { + head_seq_num =seq_inc (seq_sub (mpdu_seq_num, buf_size));/* release stored frames up to new head to stack */ -while (seq_less (tid_agg_rx->head_seq_num, head_seq_num)) { - index =seq_sub (tid_agg_rx->head_seq_num, - tid_agg_rx->ssn) - % tid_agg_rx->buf_size; -ieee80211_release_reorder_frame (hw, tid_agg_rx, - index); - } -if (bar_req) -return 1 ; +ieee80211_release_reorder_frames (hw, tid_agg_rx, head_seq_num); } -/* now the new frame is always in the range of the reordering */ -/* buffer window */ - index =seq_sub (mpdu_seq_num, tid_agg_rx->ssn) - % tid_agg_rx->buf_size; +/* Now the new frame is always in the range of the reordering buffer */ + + index =seq_sub (mpdu_seq_num, tid_agg_rx->ssn) % tid_agg_rx->buf_size; +/* check if we already stored this frame */ if (tid_agg_rx->reorder_buf[index]) {dev_kfree_skb (skb); -return 1 ; +return true; } -/* if arrived mpdu is in the right order and nothing else stored */ -/* release it immediately */ +/* +* If the current MPDU is in the right order and nothing else +* is stored we can process it directly, no need to buffer it. +*/ if (mpdu_seq_num == tid_agg_rx->head_seq_num && - tid_agg_rx->stored_mpdu_num ==0 ) { - tid_agg_rx->head_seq_num = -seq_inc (tid_agg_rx->head_seq_num); -return 0 ; + tid_agg_rx->stored_mpdu_num ==0 ) { + tid_agg_rx->head_seq_num =seq_inc (tid_agg_rx->head_seq_num); +return false; }/* put the frame in the reordering buffer */
@@ -2300,8 +2300,8 @@ static u8 ieee80211_sta_manage_reorder_b tid_agg_rx->reorder_time[index] = jiffies; tid_agg_rx->stored_mpdu_num++;/* release the buffer until next missing frame */ - index =seq_sub (tid_agg_rx->head_seq_num, tid_agg_rx->ssn) - % tid_agg_rx->buf_size; + index =seq_sub (tid_agg_rx->head_seq_num, tid_agg_rx->ssn) % + tid_agg_rx->buf_size;if (!tid_agg_rx->reorder_buf[index] && tid_agg_rx->stored_mpdu_num >1 ) {/*
@@ -2312,12 +2312,12 @@ static u8 ieee80211_sta_manage_reorder_bint skipped =1 ;for (j = (index +1 ) % tid_agg_rx->buf_size; j != index; j = (j +1 ) % tid_agg_rx->buf_size) { -if (tid_agg_rx->reorder_buf[j] ==NULL ) { +if (!tid_agg_rx->reorder_buf[j]) { skipped++;continue ; }if (!time_after (jiffies, tid_agg_rx->reorder_time[j] + -HZ /10 )) +HT_RX_REORDER_BUF_TIMEOUT ))break ;#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -2333,51 +2333,56 @@ static u8 ieee80211_sta_manage_reorder_b* Increment the head seq# also for the skipped slots. */ tid_agg_rx->head_seq_num = - (tid_agg_rx->head_seq_num + skipped) & -SEQ_MASK ; + (tid_agg_rx->head_seq_num + skipped) &SEQ_MASK ; skipped =0 ; } }else while (tid_agg_rx->reorder_buf[index]) {ieee80211_release_reorder_frame (hw, tid_agg_rx, index); - index =seq_sub (tid_agg_rx->head_seq_num, - tid_agg_rx->ssn) % tid_agg_rx->buf_size; + index =seq_sub (tid_agg_rx->head_seq_num, tid_agg_rx->ssn) % + tid_agg_rx->buf_size; } -return 1 ; + +return true; } -static u8 ieee80211_rx_reorder_ampdu (struct ieee80211_local *local, -struct sk_buff *skb) +/* +* Reorder MPDUs from A-MPDUs, keeping them on a buffer. Returns +* true if the MPDU was buffered, false if it should be processed. +*/ +static bool ieee80211_rx_reorder_ampdu (struct ieee80211_local *local, +struct sk_buff *skb) {struct ieee80211_hw *hw = &local->hw;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct sta_info *sta;struct tid_ampdu_rx *tid_agg_rx;u16 sc; -u16 mpdu_seq_num; -u8 ret =0 ;int tid; +if (!ieee80211_is_data_qos (hdr->frame_control)) +return false; + +/* +* filter the QoS data rx stream according to +* STA/TID and check if this STA/TID is on aggregation +*/ + sta =sta_info_get (local, hdr->addr2);if (!sta) -return ret; - -/* filter the QoS data rx stream according to -* STA/TID and check if this STA/TID is on aggregation */ -if (!ieee80211_is_data_qos (hdr->frame_control)) - goto end_reorder; +return false; tid = *ieee80211_get_qos_ctl (hdr) &IEEE80211_QOS_CTL_TID_MASK ;if (sta->ampdu_mlme.tid_state_rx[tid] !=HT_AGG_STATE_OPERATIONAL ) - goto end_reorder; +return false; tid_agg_rx = sta->ampdu_mlme.tid_rx[tid];/* qos null data frames are excluded */ if (unlikely (hdr->frame_control &cpu_to_le16 (IEEE80211_STYPE_NULLFUNC ))) - goto end_reorder; +return false; -/* new un-ordered ampdu frame - process it */ +/* new, potentially un-ordered, ampdu frame - process it */ /* reset session timer */ if (tid_agg_rx->timeout)
@@ -2389,16 +2394,11 @@ static u8 ieee80211_rx_reorder_ampdu(strif (sc &IEEE80211_SCTL_FRAG ) {ieee80211_sta_stop_rx_ba_session (sta->sdata, sta->sta.addr, tid,0 ,WLAN_REASON_QSTA_REQUIRE_SETUP ); - ret =1 ; - goto end_reorder; +dev_kfree_skb (skb); +return true; } -/* according to mpdu sequence number deal with reordering buffer */ - mpdu_seq_num = (sc &IEEE80211_SCTL_SEQ ) >>4 ; - ret =ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb, - mpdu_seq_num,0 ); - end_reorder: -return ret; +return ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb); }/*