mac80211: stations per virtual interface, netdev reduction
Johannes Berg
maintainerv2 cover mac80211: stations per virtual interface, netdev reduction
This patchset finally converts station to fully be managed per virtual interface.
There are also two patches to remove the use of netdevs in mac80211.
I've been running with this for a while with a few other scenarios too (like hwsim AP test) so I'm pretty confident it works. And this time it actually does work in more test scenarios ...
johannes
Johannes Berg
maintainerPATCH v2 1/5 mac80211: move cmntr flag out of rx flags
The RX flags should soon be used only for flags
that cannot change within an a-MPDU, so move the
cooked monitor flag into the RX status flags.
--- include/net/mac80211.h | 4 ++++ net/mac80211/ieee80211_i.h | 3 +-- net/mac80211/rx.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
include/net/mac80211.h +4 -0
@@ -513,6 +513,9 @@ ieee80211_tx_info_clear_status(struct ie* @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index * @RX_FLAG_40MHZ: HT40 (40 MHz) was used * @RX_FLAG_SHORT_GI: Short guard interval was used +* @RX_FLAG_INTERNAL_CMTR: set internally after frame was reported +* on cooked monitor to avoid double-reporting it for multiple +* virtual interfaces */ enum mac80211_rx_flags {RX_FLAG_MMIC_ERROR =1 <<0 ,
@@ -526,6 +529,7 @@ enum mac80211_rx_flags {RX_FLAG_HT =1 <<9 ,RX_FLAG_40MHZ =1 <<10 ,RX_FLAG_SHORT_GI =1 <<11 , + RX_FLAG_INTERNAL_CMTR = 1<<12, };/**
net/mac80211/ieee80211_i.h +1 -2
@@ -163,8 +163,7 @@ typedef unsigned __bitwise__ ieee80211_r/* frame is destined to interface currently processed (incl. multicast frames) */ #define IEEE80211_RX_RA_MATCH BIT(1)#define IEEE80211_RX_AMSDU BIT(2) -#define IEEE80211_RX_CMNTR_REPORTED BIT(3) -#define IEEE80211_RX_FRAGMENTED BIT(4) +#define IEEE80211_RX_FRAGMENTED BIT(3)struct ieee80211_rx_data {struct sk_buff *skb;
net/mac80211/rx.c +2 -2
@@ -1868,7 +1868,7 @@ static void ieee80211_rx_cooked_monitor(struct net_device *prev_dev =NULL ;struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb); -if (rx->flags &IEEE80211_RX_CMNTR_REPORTED ) +if (status->flag &RX_FLAG_INTERNAL_CMTR ) goto out_free_skb; if (skb_headroom(skb) < sizeof(*rthdr) &&
@@ -1929,7 +1929,7 @@ static void ieee80211_rx_cooked_monitor( }else goto out_free_skb; - rx->flags |=IEEE80211_RX_CMNTR_REPORTED ; + status->flag |=RX_FLAG_INTERNAL_CMTR ;return ; out_free_skb:
Johannes Berg
maintainerPATCH v2 2/5 mac80211: move aMPDU RX reorder code
In reply to Johannes BergThis code should be part of RX handlers, so move it to the place where it belongs without changing it. A follow-up patch will do the changes to hook it up. The sole purpose of this code move is to make the other patch readable, it doesn't change the code at all except that it now requires a different static function declaration (which will go away too).
--- net/mac80211/rx.c | 459 ++++++++++++++++++++++++++---------------------------- 1 file changed, 229 insertions(+), 230 deletions(-)
net/mac80211/rx.c +229 -230
@@ -27,9 +27,9 @@#include "tkip.h" #include "wme.h" -static void ieee80211_release_reorder_frames (struct ieee80211_hw *hw, -struct tid_ampdu_rx *tid_agg_rx, -u16 head_seq_num); +static void __ieee80211_rx_handle_packet (struct ieee80211_hw *hw, +struct sk_buff *skb, +struct ieee80211_rate *rate);/* * monitor mode reception
@@ -534,6 +534,232 @@ ieee80211_rx_mesh_check(struct ieee80211return RX_CONTINUE ; } +#define SEQ_MODULO 0x1000 +#define SEQ_MASK 0xfff + +static inline int seq_less (u16 sq1,u16 sq2) +{ +return ((sq1 - sq2) &SEQ_MASK ) > (SEQ_MODULO >>1 ); +} + +static inline u16 seq_inc (u16 sq) +{ +return (sq +1 ) &SEQ_MASK ; +} + +static inline u16 seq_sub (u16 sq1,u16 sq2) +{ +return (sq1 - sq2) &SEQ_MASK ; +} + + +static void ieee80211_release_reorder_frame (struct ieee80211_hw *hw, +struct tid_ampdu_rx *tid_agg_rx, +int index) +{ +struct ieee80211_supported_band *sband; +struct ieee80211_rate *rate =NULL ; +struct sk_buff *skb = tid_agg_rx->reorder_buf[index]; +struct ieee80211_rx_status *status; + +if (!skb) + goto no_frame; + + status =IEEE80211_SKB_RXCB (skb); + +/* release the reordered frames to stack */ + sband = hw->wiphy->bands[status->band]; +if (!(status->flag &RX_FLAG_HT )) + rate = &sband->bitrates[status->rate_idx]; +__ieee80211_rx_handle_packet (hw, skb, rate); + tid_agg_rx->stored_mpdu_num--; + tid_agg_rx->reorder_buf[index] =NULL ; + +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 +* the skb was added to the buffer longer than this time ago, the earlier +* frames that have not yet been received are assumed to be lost and the skb +* can be released for processing. This may also release other skb's from the +* reorder buffer if there are no additional gaps between the frames. +*/ +#define HT_RX_REORDER_BUF_TIMEOUT (HZ / 10) + +/* +* 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 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; + + buf_size = tid_agg_rx->buf_size; + head_seq_num = tid_agg_rx->head_seq_num; + +/* frame with out of date sequence number */ +if (seq_less (mpdu_seq_num, head_seq_num)) { +dev_kfree_skb (skb); +return true; + } + +/* +* 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 */ +ieee80211_release_reorder_frames (hw, tid_agg_rx, head_seq_num); + } + +/* 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 true; + } + +/* +* 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 false; + } + +/* put the frame in the reordering buffer */ + tid_agg_rx->reorder_buf[index] = skb; + 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; +if (!tid_agg_rx->reorder_buf[index] && + tid_agg_rx->stored_mpdu_num >1 ) { +/* +* No buffers ready to be released, but check whether any +* frames in the reorder buffer have timed out. +*/ +int j; +int 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]) { + skipped++; +continue ; + } +if (!time_after (jiffies, tid_agg_rx->reorder_time[j] + +HT_RX_REORDER_BUF_TIMEOUT )) +break ; + +#ifdef CONFIG_MAC80211_HT_DEBUG +if (net_ratelimit ()) +printk (KERN_DEBUG "%s: release an RX reorder " +"frame due to timeout on earlier " +"frames\n" , +wiphy_name (hw->wiphy)); +#endif +ieee80211_release_reorder_frame (hw, tid_agg_rx, j); + +/* +* Increment the head seq# also for the skipped slots. +*/ + tid_agg_rx->head_seq_num = + (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; + } + +return true; +} + +/* +* 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; +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 false; + + tid = *ieee80211_get_qos_ctl (hdr) &IEEE80211_QOS_CTL_TID_MASK ; + +if (sta->ampdu_mlme.tid_state_rx[tid] !=HT_AGG_STATE_OPERATIONAL ) +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 ))) +return false; + +/* new, potentially un-ordered, ampdu frame - process it */ + +/* reset session timer */ +if (tid_agg_rx->timeout) +mod_timer (&tid_agg_rx->session_timer, +TU_TO_EXP_TIME (tid_agg_rx->timeout)); + +/* if this mpdu is fragmented - terminate rx aggregation session */ + sc =le16_to_cpu (hdr->seq_ctrl); +if (sc &IEEE80211_SCTL_FRAG ) { +ieee80211_sta_stop_rx_ba_session (sta->sdata, sta->sta.addr, + tid,0 ,WLAN_REASON_QSTA_REQUIRE_SETUP ); +dev_kfree_skb (skb); +return true; + } + +return ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb); +} static ieee80211_rx_result debug_noinlineieee80211_rx_h_check (struct ieee80211_rx_data *rx)
@@ -2187,233 +2413,6 @@ static void __ieee80211_rx_handle_packetdev_kfree_skb (skb); } -#define SEQ_MODULO 0x1000 -#define SEQ_MASK 0xfff - -static inline int seq_less (u16 sq1,u16 sq2) -{ -return ((sq1 - sq2) &SEQ_MASK ) > (SEQ_MODULO >>1 ); -} - -static inline u16 seq_inc (u16 sq) -{ -return (sq +1 ) &SEQ_MASK ; -} - -static inline u16 seq_sub (u16 sq1,u16 sq2) -{ -return (sq1 - sq2) &SEQ_MASK ; -} - - -static void ieee80211_release_reorder_frame (struct ieee80211_hw *hw, -struct tid_ampdu_rx *tid_agg_rx, -int index) -{ -struct ieee80211_supported_band *sband; -struct ieee80211_rate *rate =NULL ; -struct sk_buff *skb = tid_agg_rx->reorder_buf[index]; -struct ieee80211_rx_status *status; - -if (!skb) - goto no_frame; - - status =IEEE80211_SKB_RXCB (skb); - -/* release the reordered frames to stack */ - sband = hw->wiphy->bands[status->band]; -if (!(status->flag &RX_FLAG_HT )) - rate = &sband->bitrates[status->rate_idx]; -__ieee80211_rx_handle_packet (hw, skb, rate); - tid_agg_rx->stored_mpdu_num--; - tid_agg_rx->reorder_buf[index] =NULL ; - -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 -* the skb was added to the buffer longer than this time ago, the earlier -* frames that have not yet been received are assumed to be lost and the skb -* can be released for processing. This may also release other skb's from the -* reorder buffer if there are no additional gaps between the frames. -*/ -#define HT_RX_REORDER_BUF_TIMEOUT (HZ / 10) - -/* -* 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 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; - - buf_size = tid_agg_rx->buf_size; - head_seq_num = tid_agg_rx->head_seq_num; - -/* frame with out of date sequence number */ -if (seq_less (mpdu_seq_num, head_seq_num)) { -dev_kfree_skb (skb); -return true; - } - -/* -* 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 */ -ieee80211_release_reorder_frames (hw, tid_agg_rx, head_seq_num); - } - -/* 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 true; - } - -/* -* 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 false; - } - -/* put the frame in the reordering buffer */ - tid_agg_rx->reorder_buf[index] = skb; - 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; -if (!tid_agg_rx->reorder_buf[index] && - tid_agg_rx->stored_mpdu_num >1 ) { -/* -* No buffers ready to be released, but check whether any -* frames in the reorder buffer have timed out. -*/ -int j; -int 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]) { - skipped++; -continue ; - } -if (!time_after (jiffies, tid_agg_rx->reorder_time[j] + -HT_RX_REORDER_BUF_TIMEOUT )) -break ; - -#ifdef CONFIG_MAC80211_HT_DEBUG -if (net_ratelimit ()) -printk (KERN_DEBUG "%s: release an RX reorder " -"frame due to timeout on earlier " -"frames\n" , -wiphy_name (hw->wiphy)); -#endif -ieee80211_release_reorder_frame (hw, tid_agg_rx, j); - -/* -* Increment the head seq# also for the skipped slots. -*/ - tid_agg_rx->head_seq_num = - (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; - } - -return true; -} - -/* -* 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; -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 false; - - tid = *ieee80211_get_qos_ctl (hdr) &IEEE80211_QOS_CTL_TID_MASK ; - -if (sta->ampdu_mlme.tid_state_rx[tid] !=HT_AGG_STATE_OPERATIONAL ) -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 ))) -return false; - -/* new, potentially un-ordered, ampdu frame - process it */ - -/* reset session timer */ -if (tid_agg_rx->timeout) -mod_timer (&tid_agg_rx->session_timer, -TU_TO_EXP_TIME (tid_agg_rx->timeout)); - -/* if this mpdu is fragmented - terminate rx aggregation session */ - sc =le16_to_cpu (hdr->seq_ctrl); -if (sc &IEEE80211_SCTL_FRAG ) { -ieee80211_sta_stop_rx_ba_session (sta->sdata, sta->sta.addr, - tid,0 ,WLAN_REASON_QSTA_REQUIRE_SETUP ); -dev_kfree_skb (skb); -return true; - } - -return ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb); -} -/* * This is the receive path handler. It is called by a low level driver when an * 802.11 MPDU is received from the hardware.
Johannes Berg
maintainerPATCH v2 3/5 mac80211: correctly place aMPDU RX reorder code
In reply to Johannes BergAs indicated by the comment, the aMPDU RX reorder code should logically be after ieee80211_rx_h_check(). The previous patch moved the code there, and this patch now hooks it up in that place by introducing a list of skbs that are then processed by the remaining handlers. The list may be empty if the function is buffering the skb to release it later.
The only change needed to the RX data is that the crypto handler needs to clear the key that may be set from a previous loop iteration, and that not everything can be in the rx flags now.
---
v2: ieee80211_rx_reorder_ampdu must not ignore the return
value of ieee80211_sta_manage_reorder_buf()
net/mac80211/ieee80211_i.h | 1 net/mac80211/rx.c | 168 +++++++++++++++++++++++++-------------------- 2 files changed, 96 insertions(+), 73 deletions(-)
net/mac80211/rx.c +95 -73
@@ -27,10 +27,6 @@#include "tkip.h" #include "wme.h" -static void __ieee80211_rx_handle_packet (struct ieee80211_hw *hw, -struct sk_buff *skb, -struct ieee80211_rate *rate); -/* * monitor mode reception *
@@ -555,7 +551,8 @@ static inline u16 seq_sub(u16 sq1, u16 sstatic void ieee80211_release_reorder_frame (struct ieee80211_hw *hw,struct tid_ampdu_rx *tid_agg_rx, -int index) +int index, +struct sk_buff_head *frames) {struct ieee80211_supported_band *sband;struct ieee80211_rate *rate =NULL ;
@@ -571,9 +568,9 @@ static void ieee80211_release_reorder_fr sband = hw->wiphy->bands[status->band];if (!(status->flag &RX_FLAG_HT )) rate = &sband->bitrates[status->rate_idx]; -__ieee80211_rx_handle_packet (hw, skb, rate); tid_agg_rx->stored_mpdu_num--; tid_agg_rx->reorder_buf[index] =NULL ; +skb_queue_tail (frames, skb); no_frame: tid_agg_rx->head_seq_num =seq_inc (tid_agg_rx->head_seq_num);
@@ -581,14 +578,15 @@ no_frame:static void ieee80211_release_reorder_frames (struct ieee80211_hw *hw,struct tid_ampdu_rx *tid_agg_rx, -u16 head_seq_num) +u16 head_seq_num, +struct sk_buff_head *frames) {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); +ieee80211_release_reorder_frame (hw, tid_agg_rx, index, frames); } }
@@ -608,7 +606,8 @@ static void ieee80211_release_reorder_fr*/ static bool ieee80211_sta_manage_reorder_buf (struct ieee80211_hw *hw,struct tid_ampdu_rx *tid_agg_rx, -struct sk_buff *skb) +struct sk_buff *skb, +struct sk_buff_head *frames) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;u16 sc =le16_to_cpu (hdr->seq_ctrl);
@@ -632,7 +631,8 @@ static bool ieee80211_sta_manage_reorderif (!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 */ -ieee80211_release_reorder_frames (hw, tid_agg_rx, head_seq_num); +ieee80211_release_reorder_frames (hw, tid_agg_rx, head_seq_num, + frames); }/* Now the new frame is always in the range of the reordering buffer */
@@ -687,7 +687,8 @@ static bool ieee80211_sta_manage_reorder"frames\n" , wiphy_name(hw->wiphy));#endif -ieee80211_release_reorder_frame (hw, tid_agg_rx, j); +ieee80211_release_reorder_frame (hw, tid_agg_rx, + j, frames);/* * Increment the head seq# also for the skipped slots.
@@ -697,7 +698,7 @@ static bool ieee80211_sta_manage_reorder skipped =0 ; } }else while (tid_agg_rx->reorder_buf[index]) { -ieee80211_release_reorder_frame (hw, tid_agg_rx, index); +ieee80211_release_reorder_frame (hw, tid_agg_rx, index, frames); index =seq_sub (tid_agg_rx->head_seq_num, tid_agg_rx->ssn) % tid_agg_rx->buf_size; }
@@ -709,38 +710,39 @@ static bool ieee80211_sta_manage_reorder* 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) +static void ieee80211_rx_reorder_ampdu (struct ieee80211_rx_data *rx, +struct sk_buff_head *frames) { +struct sk_buff *skb = rx->skb; +struct ieee80211_local *local = rx->local;struct ieee80211_hw *hw = &local->hw;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; -struct sta_info *sta; +struct sta_info *sta = rx->sta;struct tid_ampdu_rx *tid_agg_rx;u16 sc;int tid;if (!ieee80211_is_data_qos (hdr->frame_control)) -return false; + goto dont_reorder;/* * 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 false; + goto dont_reorder; tid = *ieee80211_get_qos_ctl (hdr) &IEEE80211_QOS_CTL_TID_MASK ;if (sta->ampdu_mlme.tid_state_rx[tid] !=HT_AGG_STATE_OPERATIONAL ) -return false; + goto dont_reorder; 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 ))) -return false; + goto dont_reorder;/* new, potentially un-ordered, ampdu frame - process it */
@@ -755,10 +757,14 @@ static bool ieee80211_rx_reorder_ampdu(sieee80211_sta_stop_rx_ba_session (sta->sdata, sta->sta.addr, tid,0 ,WLAN_REASON_QSTA_REQUIRE_SETUP );dev_kfree_skb (skb); -return true; +return ; } -return ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb); +if (ieee80211_sta_manage_reorder_buf (hw, tid_agg_rx, skb, frames)) +return ; + + dont_reorder: +__skb_queue_tail (frames, skb); }static ieee80211_rx_result debug_noinline
@@ -863,6 +869,9 @@ ieee80211_rx_h_decrypt(struct ieee80211_if (!(rx->flags &IEEE80211_RX_RA_MATCH ))return RX_CONTINUE ; +/* start without a key */ + rx->key =NULL ; +if (rx->sta) stakey =rcu_dereference (rx->sta->key);
@@ -1815,7 +1824,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ } static ieee80211_rx_result debug_noinline -ieee80211_rx_h_ctrl (struct ieee80211_rx_data *rx) +ieee80211_rx_h_ctrl (struct ieee80211_rx_data *rx,struct sk_buff_head *frames) {struct ieee80211_local *local = rx->local;struct ieee80211_hw *hw = &local->hw;
@@ -1845,7 +1854,8 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_ TU_TO_EXP_TIME(tid_agg_rx->timeout));/* release stored frames up to start of BAR */ -ieee80211_release_reorder_frames (hw, tid_agg_rx, start_seq_num); +ieee80211_release_reorder_frames (hw, tid_agg_rx, start_seq_num, + frames);kfree_skb (skb);return RX_QUEUED ; }
@@ -2168,8 +2178,11 @@ static void ieee80211_invoke_rx_handlersstruct sk_buff *skb, struct ieee80211_rate *rate) { + struct sk_buff_head reorder_release;ieee80211_rx_result res =RX_DROP_MONITOR ; +__skb_queue_head_init (&reorder_release); + rx->skb = skb; rx->sdata = sdata;
@@ -2177,50 +2190,72 @@ static void ieee80211_invoke_rx_handlersdo { \ res =rxh (rx); \if (res !=RX_CONTINUE ) \ - goto rxh_done; \ + goto rxh_next; \ }while (0 ); +/* +* NB: the rxh_next label works even if we jump +* to it from here because then the list will +* be empty, which is a trivial check +*/ CALL_RXH(ieee80211_rx_h_passive_scan) CALL_RXH(ieee80211_rx_h_check) - CALL_RXH(ieee80211_rx_h_decrypt) - CALL_RXH(ieee80211_rx_h_check_more_data) - CALL_RXH(ieee80211_rx_h_sta_process) - CALL_RXH(ieee80211_rx_h_defragment) - CALL_RXH(ieee80211_rx_h_ps_poll) - CALL_RXH(ieee80211_rx_h_michael_mic_verify) - /* must be after MMIC verify so header is counted in MPDU mic */ - CALL_RXH(ieee80211_rx_h_remove_qos_control) - CALL_RXH(ieee80211_rx_h_amsdu) + + ieee80211_rx_reorder_ampdu(rx, &reorder_release); + +while ((skb =__skb_dequeue (&reorder_release))) { +/* +* all the other fields are valid across frames +* that belong to an aMPDU since they are on the +* same TID from the same station +*/ + rx->skb = skb; + + CALL_RXH(ieee80211_rx_h_decrypt) + CALL_RXH(ieee80211_rx_h_check_more_data) + CALL_RXH(ieee80211_rx_h_sta_process) + CALL_RXH(ieee80211_rx_h_defragment) + CALL_RXH(ieee80211_rx_h_ps_poll) + CALL_RXH(ieee80211_rx_h_michael_mic_verify) + /* must be after MMIC verify so header is counted in MPDU mic */ + CALL_RXH(ieee80211_rx_h_remove_qos_control) + CALL_RXH(ieee80211_rx_h_amsdu) #ifdef CONFIG_MAC80211_MESH - if (ieee80211_vif_is_mesh(&sdata->vif)) - CALL_RXH(ieee80211_rx_h_mesh_fwding); + if (ieee80211_vif_is_mesh(&sdata->vif)) + CALL_RXH(ieee80211_rx_h_mesh_fwding);#endif - CALL_RXH(ieee80211_rx_h_data) - CALL_RXH(ieee80211_rx_h_ctrl) - CALL_RXH(ieee80211_rx_h_action) - CALL_RXH(ieee80211_rx_h_mgmt) +CALL_RXH (ieee80211_rx_h_data) + +/* special treatment -- needs the queue */ + res =ieee80211_rx_h_ctrl (rx, &reorder_release); +if (res !=RX_CONTINUE ) + goto rxh_next; + + CALL_RXH(ieee80211_rx_h_action) + CALL_RXH(ieee80211_rx_h_mgmt)#undef CALL_RXH - rxh_done: -switch (res) { -case RX_DROP_MONITOR : -I802_DEBUG_INC (sdata->local->rx_handlers_drop); -if (rx->sta) - rx->sta->rx_dropped++; -/* fall through */ -case RX_CONTINUE : -ieee80211_rx_cooked_monitor (rx, rate); -break ; -case RX_DROP_UNUSABLE : -I802_DEBUG_INC (sdata->local->rx_handlers_drop); -if (rx->sta) - rx->sta->rx_dropped++; -dev_kfree_skb (rx->skb); -break ; -case RX_QUEUED : -I802_DEBUG_INC (sdata->local->rx_handlers_queued); -break ; + rxh_next: +switch (res) { +case RX_DROP_MONITOR : +I802_DEBUG_INC (sdata->local->rx_handlers_drop); +if (rx->sta) + rx->sta->rx_dropped++; +/* fall through */ +case RX_CONTINUE : +ieee80211_rx_cooked_monitor (rx, rate); +break ; +case RX_DROP_UNUSABLE : +I802_DEBUG_INC (sdata->local->rx_handlers_drop); +if (rx->sta) + rx->sta->rx_dropped++; +dev_kfree_skb (rx->skb); +break ; +case RX_QUEUED : +I802_DEBUG_INC (sdata->local->rx_handlers_queued); +break ; + } } }
@@ -2494,20 +2529,7 @@ void ieee80211_rx(struct ieee80211_hw *hreturn ; } -/* -* In theory, the block ack reordering should happen after duplicate -* removal (ieee80211_rx_h_check(), which is an RX handler). As such, -* the call to ieee80211_rx_reorder_ampdu() should really be moved to -* happen as a new RX handler between ieee80211_rx_h_check and -* ieee80211_rx_h_decrypt. This cleanup may eventually happen, but for -* the time being, the call can be here since RX reorder buf processing -* will implicitly skip duplicates. We could, in theory at least, -* process frames that ieee80211_rx_h_passive_scan would drop (e.g., -* frames from other than operational channel), but that should not -* happen in normal networks. -*/ -if (!ieee80211_rx_reorder_ampdu (local, skb)) -__ieee80211_rx_handle_packet (hw, skb, rate); +__ieee80211_rx_handle_packet (hw, skb, rate);rcu_read_unlock ();
net/mac80211/ieee80211_i.h +1 -0
@@ -164,6 +164,7 @@ typedef unsigned __bitwise__ ieee80211_r#define IEEE80211_RX_RA_MATCH BIT(1)#define IEEE80211_RX_AMSDU BIT(2)#define IEEE80211_RX_FRAGMENTED BIT(3) +/* only add flags here that do not change with subframes of an aMPDU */ struct ieee80211_rx_data {struct sk_buff *skb;
Re: [PATCH v2 3/5] mac80211: correctly place aMPDU RX reorder code
Hi Johannes,
Quoted 8 lines · Johannes Berg
As indicated by the comment, the aMPDU RX reorder code should logically be after
ieee80211_rx_h_check(). The previous patch moved the code there, and this patch now hooks it up in that place by introducing a list of skbs that are then processed by the remaining handlers. The list may be empty if the function is buffering the skb to release it later.
Quoted 6 lines
The only change needed to the RX data is that the crypto handler needs to clear the key that may be set from a previous loop iteration, and that not everything can be in the rx flags now.
Signed-off-by Johannes Berg <[email protected]>
I bisected a hang problem to this patch. When associating to an 11n AP (tested on 5GHz), ping works fine, but trying to copy a large file causes the system to freeze (keyboard lights start blinking and system unresponsive. Reverting this patch I can copy large files successfully.
This is also described in
http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2126.
Here is the panic:
[ 729.671546] BUG: unable to handle kernel NULL pointer dereference at (null) [ 729.671656] IP: [<ffffffff81074b89>] __bfs+0xc9/0x270 [ 729.671729] PGD 0 [ 729.671796] Oops: 0000 [#1] SMP [ 729.671900] last sysfs file: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0A:00/power_supply/BAT0/energy_full [ 729.671939] CPU 0 [ 729.672008] Modules linked in: iwlagn iwlcore mac80211 cfg80211 i915 drm_kms_helper drm i2c_algo_bit i2c_core ipv6 acpi_cpufreq cpufreq_userspace cpufreq_powersave cpufreq_ondemand cpufreq_conservative cpufreq_stats freq_table container sbs sbshc pcmcia joydev arc4 ecb af_packet yenta_socket psmouse rsrc_nonstatic evdev pcspkr serio_raw pcmcia_core iTCO_wdt iTCO_vendor_support intel_agp button battery sony_laptop rfkill tpm_infineon tpm tpm_bios video output ac processor ext3 jbd mbcache sg sr_mod cdrom sd_mod ahci libata scsi_mod ehci_hcd uhci_hcd usbcore thermal fan thermal_sys [last unloaded: cfg80211] [ 729.672010] Pid: 14639, comm: ssh Not tainted 2.6.32-rc8-wl-60817-gc1f4e0e #96 VGN-Z540N [ 729.672010] RIP: 0010:[<ffffffff81074b89>] [<ffffffff81074b89>] __bfs+0xc9/0x270 [ 729.672010] RSP: 0018:ffff8800020036e0 EFLAGS: 00010002 [ 729.672010] RAX: ffffffff81af3f30 RBX: ffffffff81af3f20 RCX: ffff880002003760 [ 729.672010] RDX: ffff880002003708 RSI: 0000000000000006 RDI: ffff880002003760 [ 729.672010] RBP: ffff880002003740 R08: 0000000000000001 R09: 0000000000000000 [ 729.672010] R10: ffff8800955f86b0 R11: 0000000000000000 R12: 0000000000000006 [ 729.672010] R13: ffffffff81073810 R14: ffff8800020037a8 R15: 0000000000000000 [ 729.672010] FS: 00007fdf4f7d3710(0000) GS:ffff880002000000(0000) knlGS:0000000000000000 [ 729.672010] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 729.672010] CR2: 0000000000000000 CR3: 0000000079ff7000 CR4: 00000000000006f0 [ 729.672010] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 729.672010] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 729.672010] Process ssh (pid: 14639, threadinfo ffff88005a630000, task ffff8800955f8000) [ 729.672010] Stack: [ 729.672010] 000000000000b520 ffffffff813624c0 ffff88005a631d50 ffffffff00000001 [ 729.672010] <0> ffff880002003790 ffff880002003760 ffff88000200375c ffff880002003760 [ 729.672010] <0> ffff8800955f86b0 ffffffff814811cd ffff8800955f8000 ffffffff8107a6c0 [ 729.672010] Call Trace: [ 729.672010] <IRQ> [ 729.672010] [<ffffffff8107a6c0>] ? check_usage_forwards+0x0/0x110 [ 729.672010] [<ffffffff8107a741>] check_usage_forwards+0x81/0x110 [ 729.672010] [<ffffffff81076210>] mark_lock+0x200/0x640 [ 729.672010] [<ffffffff8107824f>] __lock_acquire+0xabf/0x1d30 [ 729.672010] [<ffffffff8107955b>] lock_acquire+0x9b/0x120 [ 729.672010] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffff813593a1>] _spin_lock_irqsave+0x41/0x60 [ 729.672010] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffff81359130>] ? _spin_unlock_irqrestore+0x40/0x60 [ 729.672010] [<ffffffff812aff1b>] skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffffa04b11f5>] ieee80211_release_reorder_frame+0x35/0x50 [mac80211] [ 729.672010] [<ffffffffa04b2f0c>] ieee80211_invoke_rx_handlers+0xb8c/0x1990 [mac80211] [ 729.672010] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.672010] [<ffffffff81358f30>] ? _write_unlock_irqrestore+0x40/0x60 [ 729.672010] [<ffffffff810768bb>] ? trace_hardirqs_on_caller+0x6b/0x190 [ 729.672010] [<ffffffff810769ed>] ? trace_hardirqs_on+0xd/0x10 [ 729.672010] [<ffffffffa04b3db6>] ? ieee80211_rx+0xa6/0x8f0 [mac80211] [ 729.672010] [<ffffffffa04b3fef>] ieee80211_rx+0x2df/0x8f0 [mac80211] [ 729.672010] [<ffffffffa04b3db6>] ? ieee80211_rx+0xa6/0x8f0 [mac80211] [ 729.672010] [<ffffffff812af1c7>] ? skb_copy_bits+0x167/0x2b0 [ 729.672010] [<ffffffffa04fd2f1>] iwl_rx_reply_rx+0x571/0xee0 [iwlcore] [ 729.672010] [<ffffffff8100efb5>] ? dump_trace+0x105/0x2c0 [ 729.672010] [<ffffffff811dceb9>] ? debug_dma_unmap_page+0x59/0x60 [ 729.672010] [<ffffffffa0557e89>] iwl_rx_handle+0x149/0x670 [iwlagn] [ 729.672010] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.672010] [<ffffffffa0559afc>] iwl_irq_tasklet+0x2ec/0x1320 [iwlagn] [ 729.672010] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.672010] [<ffffffff8104b1d9>] ? tasklet_action+0x49/0xe0 [ 729.672010] [<ffffffff8104b260>] tasklet_action+0xd0/0xe0 [ 729.672010] [<ffffffff8104c78b>] __do_softirq+0xcb/0x200 [ 729.672010] [<ffffffff8100d09c>] call_softirq+0x1c/0x50 [ 729.672010] [<ffffffff8100e80d>] do_softirq+0x7d/0xb0 [ 729.672010] [<ffffffff8104c2c5>] irq_exit+0x95/0xa0 [ 729.672010] [<ffffffff8135e485>] do_IRQ+0x75/0xf0 [ 729.672010] [<ffffffff8100c893>] ret_from_intr+0x0/0xf [ 729.672010] <EOI> [ 729.672010] [<ffffffff8102eccd>] ? flush_tlb_page+0x7d/0x90 [ 729.672010] [<ffffffff8102ec98>] ? flush_tlb_page+0x48/0x90 [ 729.672010] [<ffffffff810f508d>] ? move_page_tables+0x2cd/0x4c0 [ 729.672010] [<ffffffff810f5133>] ? move_page_tables+0x373/0x4c0 [ 729.672010] [<ffffffff810f5879>] ? do_mremap+0x5f9/0x7a0 [ 729.672010] [<ffffffff810f5a7f>] ? sys_mremap+0x5f/0x90 [ 729.672010] [<ffffffff8100bedb>] ? system_call_fastpath+0x16/0x1b [ 729.672010] Code: 0a 89 05 bb f5 da 00 48 8b 41 10 48 85 c0 0f 84 2e 01 00 00 48 8d 98 70 01 00 00 48 05 80 01 00 00 45 85 c0 48 0f 44 d8 4c 8b 3b <49> 8b 07 49 39 df 0f 18 08 74 a4 4c 89 f8 48 2d c0 c2 76 81 48 [ 729.672010] RIP [<ffffffff81074b89>] __bfs+0xc9/0x270 [ 729.672010] RSP <ffff8800020036e0> [ 729.672010] CR2: 0000000000000000 [ 729.672010] ---[ end trace 73a47421077c9586 ]--- [ 729.672010] Kernel panic - not syncing: Fatal exception in interrupt [ 729.672010] Pid: 14639, comm: ssh Tainted: G D 2.6.32-rc8-wl-60817-gc1f4e0e #96 [ 729.672010] Call Trace: [ 729.672010] <IRQ> [<ffffffff81355ad6>] panic+0x78/0x136 [ 729.672010] [<ffffffff8135a752>] oops_end+0xe2/0xf0 [ 729.672010] [<ffffffff8102aab2>] no_context+0xf2/0x260 [ 729.672010] [<ffffffff8129f7a5>] ? led_trigger_event+0x85/0x90 [ 729.672010] [<ffffffff8102ad45>] __bad_area_nosemaphore+0x125/0x1e0 [ 729.672010] [<ffffffffa04b4f47>] ? __ieee80211_tx+0x147/0x1a0 [mac80211] [ 729.672010] [<ffffffff8102ae13>] bad_area_nosemaphore+0x13/0x20 [ 729.672010] [<ffffffff8135c174>] do_page_fault+0x2d4/0x380 [ 729.672010] [<ffffffff81073810>] ? usage_match+0x0/0x20 [ 729.672010] [<ffffffff8135994f>] page_fault+0x1f/0x30 [ 729.672010] [<ffffffff81073810>] ? usage_match+0x0/0x20 [ 729.672010] [<ffffffff81074b89>] ? __bfs+0xc9/0x270 [ 729.672010] [<ffffffff8107a6c0>] ? check_usage_forwards+0x0/0x110 [ 729.672010] [<ffffffff8107a741>] check_usage_forwards+0x81/0x110 [ 729.672010] [<ffffffff81076210>] mark_lock+0x200/0x640 [ 729.672010] [<ffffffff8107824f>] __lock_acquire+0xabf/0x1d30 [ 729.672010] [<ffffffff8107955b>] lock_acquire+0x9b/0x120 [ 729.672010] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffff813593a1>] _spin_lock_irqsave+0x41/0x60 [ 729.672010] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffff81359130>] ? _spin_unlock_irqrestore+0x40/0x60 [ 729.672010] [<ffffffff812aff1b>] skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffffa04b11f5>] ieee80211_release_reorder_frame+0x35/0x50 [mac80211] [ 729.672010] [<ffffffffa04b2f0c>] ieee80211_invoke_rx_handlers+0xb8c/0x1990 [mac80211] [ 729.672010] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.672010] [<ffffffff81358f30>] ? _write_unlock_irqrestore+0x40/0x60 [ 729.672010] [<ffffffff810768bb>] ? trace_hardirqs_on_caller+0x6b/0x190 [ 729.672010] [<ffffffff810769ed>] ? trace_hardirqs_on+0xd/0x10 [ 729.672010] [<ffffffffa04b3db6>] ? ieee80211_rx+0xa6/0x8f0 [mac80211] [ 729.672010] [<ffffffffa04b3fef>] ieee80211_rx+0x2df/0x8f0 [mac80211] [ 729.672010] [<ffffffffa04b3db6>] ? ieee80211_rx+0xa6/0x8f0 [mac80211] [ 729.672010] [<ffffffff812af1c7>] ? skb_copy_bits+0x167/0x2b0 [ 729.672010] [<ffffffffa04fd2f1>] iwl_rx_reply_rx+0x571/0xee0 [iwlcore] [ 729.672010] [<ffffffff8100efb5>] ? dump_trace+0x105/0x2c0 [ 729.672010] [<ffffffff811dceb9>] ? debug_dma_unmap_page+0x59/0x60 [ 729.672010] [<ffffffffa0557e89>] iwl_rx_handle+0x149/0x670 [iwlagn] [ 729.672010] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.672010] [<ffffffffa0559afc>] iwl_irq_tasklet+0x2ec/0x1320 [iwlagn] [ 729.672010] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.672010] [<ffffffff8104b1d9>] ? tasklet_action+0x49/0xe0 [ 729.672010] [<ffffffff8104b260>] tasklet_action+0xd0/0xe0 [ 729.672010] [<ffffffff8104c78b>] __do_softirq+0xcb/0x200 [ 729.672010] [<ffffffff8100d09c>] call_softirq+0x1c/0x50 [ 729.672010] [<ffffffff8100e80d>] do_softirq+0x7d/0xb0 [ 729.672010] [<ffffffff8104c2c5>] irq_exit+0x95/0xa0 [ 729.672010] [<ffffffff8135e485>] do_IRQ+0x75/0xf0 [ 729.672010] [<ffffffff8100c893>] ret_from_intr+0x0/0xf [ 729.672010] <EOI> [<ffffffff8102eccd>] ? flush_tlb_page+0x7d/0x90 [ 729.672010] [<ffffffff8102ec98>] ? flush_tlb_page+0x48/0x90 [ 729.672010] [<ffffffff810f508d>] ? move_page_tables+0x2cd/0x4c0 [ 729.672010] [<ffffffff810f5133>] ? move_page_tables+0x373/0x4c0 [ 729.672010] [<ffffffff810f5879>] ? do_mremap+0x5f9/0x7a0 [ 729.672010] [<ffffffff810f5a7f>] ? sys_mremap+0x5f/0x90 [ 729.672010] [<ffffffff8100bedb>] ? system_call_fastpath+0x16/0x1b [ 729.682892] ------------[ cut here ]------------ [ 729.682936] WARNING: at /home/rchatre/iwlwifi-2.6/arch/x86/kernel/smp.c:117 native_smp_send_reschedule+0x54/0x60() [ 729.682976] Hardware name: VGN-Z540N [ 729.683014] Modules linked in: iwlagn iwlcore mac80211 cfg80211 i915 drm_kms_helper drm i2c_algo_bit i2c_core ipv6 acpi_cpufreq cpufreq_userspace cpufreq_powersave cpufreq_ondemand cpufreq_conservative cpufreq_stats freq_table container sbs sbshc pcmcia joydev arc4 ecb af_packet yenta_socket psmouse rsrc_nonstatic evdev pcspkr serio_raw pcmcia_core iTCO_wdt iTCO_vendor_support intel_agp button battery sony_laptop rfkill tpm_infineon tpm tpm_bios video output ac processor ext3 jbd mbcache sg sr_mod cdrom sd_mod ahci libata scsi_mod ehci_hcd uhci_hcd usbcore thermal fan thermal_sys [last unloaded: cfg80211] [ 729.685583] Pid: 14639, comm: ssh Tainted: G D 2.6.32-rc8-wl-60817-gc1f4e0e #96 [ 729.685623] Call Trace: [ 729.685663] <IRQ> [<ffffffff81044deb>] warn_slowpath_common+0x7b/0xc0 [ 729.685750] [<ffffffff81044e44>] warn_slowpath_null+0x14/0x20 [ 729.685793] [<ffffffff810213d4>] native_smp_send_reschedule+0x54/0x60 [ 729.685838] [<ffffffff81030048>] resched_task+0x68/0x70 [ 729.685882] [<ffffffff81036ae9>] check_preempt_wakeup+0x1c9/0x240 [ 729.685926] [<ffffffff810402ff>] try_to_wake_up+0x1af/0x250 [ 729.685970] [<ffffffff810403b2>] default_wake_function+0x12/0x20 [ 729.686014] [<ffffffff810637d6>] autoremove_wake_function+0x16/0x40 [ 729.686057] [<ffffffff8102f8f9>] __wake_up_common+0x59/0x90 [ 729.686100] [<ffffffff81036088>] __wake_up+0x48/0x70 [ 729.686151] [<ffffffffa040aa91>] i915_driver_irq_handler+0x3c1/0x5b0 [i915] [ 729.686196] [<ffffffff810a42d0>] handle_IRQ_event+0x50/0x160 [ 729.686240] [<ffffffff810a63bd>] handle_edge_irq+0xcd/0x170 [ 729.686283] [<ffffffff8100e862>] handle_irq+0x22/0x30 [ 729.686327] [<ffffffff8135e47c>] do_IRQ+0x6c/0xf0 [ 729.686372] [<ffffffff8100c893>] ret_from_intr+0x0/0xf [ 729.686417] [<ffffffff81355b70>] ? panic+0x112/0x136 [ 729.686459] [<ffffffff81355b73>] ? panic+0x115/0x136 [ 729.686502] [<ffffffff81355b70>] ? panic+0x112/0x136 [ 729.686545] [<ffffffff8135a752>] ? oops_end+0xe2/0xf0 [ 729.686589] [<ffffffff8102aab2>] ? no_context+0xf2/0x260 [ 729.686632] [<ffffffff8129f7a5>] ? led_trigger_event+0x85/0x90 [ 729.686676] [<ffffffff8102ad45>] ? __bad_area_nosemaphore+0x125/0x1e0 [ 729.686724] [<ffffffffa04b4f47>] ? __ieee80211_tx+0x147/0x1a0 [mac80211] [ 729.686769] [<ffffffff8102ae13>] ? bad_area_nosemaphore+0x13/0x20 [ 729.686813] [<ffffffff8135c174>] ? do_page_fault+0x2d4/0x380 [ 729.686858] [<ffffffff81073810>] ? usage_match+0x0/0x20 [ 729.686884] [<ffffffff8135994f>] ? page_fault+0x1f/0x30 [ 729.686884] [<ffffffff81073810>] ? usage_match+0x0/0x20 [ 729.686884] [<ffffffff81074b89>] ? __bfs+0xc9/0x270 [ 729.686884] [<ffffffff8107a6c0>] ? check_usage_forwards+0x0/0x110 [ 729.686884] [<ffffffff8107a741>] ? check_usage_forwards+0x81/0x110 [ 729.686884] [<ffffffff81076210>] ? mark_lock+0x200/0x640 [ 729.686884] [<ffffffff8107824f>] ? __lock_acquire+0xabf/0x1d30 [ 729.686884] [<ffffffff8107955b>] ? lock_acquire+0x9b/0x120 [ 729.686884] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.686884] [<ffffffff813593a1>] ? _spin_lock_irqsave+0x41/0x60 [ 729.686884] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.686884] [<ffffffff81359130>] ? _spin_unlock_irqrestore+0x40/0x60 [ 729.686884] [<ffffffff812aff1b>] ? skb_queue_tail+0x2b/0x60 [ 729.686884] [<ffffffffa04b11f5>] ? ieee80211_release_reorder_frame+0x35/0x50 [mac80211] [ 729.686884] [<ffffffffa04b2f0c>] ? ieee80211_invoke_rx_handlers+0xb8c/0x1990 [mac80211] [ 729.686884] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.686884] [<ffffffff81358f30>] ? _write_unlock_irqrestore+0x40/0x60 [ 729.686884] [<ffffffff810768bb>] ? trace_hardirqs_on_caller+0x6b/0x190 [ 729.686884] [<ffffffff810769ed>] ? trace_hardirqs_on+0xd/0x10 [ 729.686884] [<ffffffffa04b3db6>] ? ieee80211_rx+0xa6/0x8f0 [mac80211] [ 729.686884] [<ffffffffa04b3fef>] ? ieee80211_rx+0x2df/0x8f0 [mac80211] [ 729.686884] [<ffffffffa04b3db6>] ? ieee80211_rx+0xa6/0x8f0 [mac80211] [ 729.686884] [<ffffffff812af1c7>] ? skb_copy_bits+0x167/0x2b0 [ 729.686884] [<ffffffffa04fd2f1>] ? iwl_rx_reply_rx+0x571/0xee0 [iwlcore] [ 729.686884] [<ffffffff8100efb5>] ? dump_trace+0x105/0x2c0 [ 729.686884] [<ffffffff811dceb9>] ? debug_dma_unmap_page+0x59/0x60 [ 729.686884] [<ffffffffa0557e89>] ? iwl_rx_handle+0x149/0x670 [iwlagn] [ 729.686884] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.686884] [<ffffffffa0559afc>] ? iwl_irq_tasklet+0x2ec/0x1320 [iwlagn] [ 729.686884] [<ffffffff810766bc>] ? mark_held_locks+0x6c/0xa0 [ 729.686884] [<ffffffff8104b1d9>] ? tasklet_action+0x49/0xe0 [ 729.686884] [<ffffffff8104b260>] ? tasklet_action+0xd0/0xe0 [ 729.686884] [<ffffffff8104c78b>] ? __do_softirq+0xcb/0x200 [ 729.686884] [<ffffffff8100d09c>] ? call_softirq+0x1c/0x50 [ 729.686884] [<ffffffff8100e80d>] ? do_softirq+0x7d/0xb0 [ 729.686884] [<ffffffff8104c2c5>] ? irq_exit+0x95/0xa0 [ 729.686884] [<ffffffff8135e485>] ? do_IRQ+0x75/0xf0 [ 729.686884] [<ffffffff8100c893>] ? ret_from_intr+0x0/0xf [ 729.686884] <EOI> [<ffffffff8102eccd>] ? flush_tlb_page+0x7d/0x90 [ 729.686884] [<ffffffff8102ec98>] ? flush_tlb_page+0x48/0x90 [ 729.686884] [<ffffffff810f508d>] ? move_page_tables+0x2cd/0x4c0 [ 729.686884] [<ffffffff810f5133>] ? move_page_tables+0x373/0x4c0 [ 729.686884] [<ffffffff810f5879>] ? do_mremap+0x5f9/0x7a0 [ 729.686884] [<ffffffff810f5a7f>] ? sys_mremap+0x5f/0x90 [ 729.686884] [<ffffffff8100bedb>] ? system_call_fastpath+0x16/0x1b [ 729.686884] ---[ end trace 73a47421077c9587 ]---
Reinette
Johannes Berg
maintainerRe: [PATCH v2 3/5] mac80211: correctly place aMPDU RX reorder code
Quoted 4 lines · reinette chatre
I bisected a hang problem to this patch. When associating to an 11n AP (tested on 5GHz), ping works fine, but trying to copy a large file causes the system to freeze (keyboard lights start blinking and system unresponsive. Reverting this patch I can copy large files successfully.
Ouch. Thanks for the report/information, I'll look into it promptly.
johannes
Johannes Berg
maintainerRe: [PATCH v2 3/5] mac80211: correctly place aMPDU RX reorder code
In reply to reinette chatreQuoted 2 lines · reinette chatre
[ 729.672010] [<ffffffff812aff1b>] skb_queue_tail+0x2b/0x60 [ 729.672010] [<ffffffffa04b11f5>] ieee80211_release_reorder_frame+0x35/0x50 [mac80211]
So Christian beat me to looking at the trace and pointed out that skb_queue_tail has no business here, we've intentionally not initialised the spinlock. The patch below should fix it. I suppose I never had actual reordering in my tests.
johannes
--- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rx.c +1 -1
@@ -570,7 +570,7 @@ static void ieee80211_release_reorder_fr rate = &sband->bitrates[status->rate_idx]; tid_agg_rx->stored_mpdu_num--; tid_agg_rx->reorder_buf[index] =NULL ; -skb_queue_tail (frames, skb); +__skb_queue_tail (frames, skb); no_frame: tid_agg_rx->head_seq_num =seq_inc (tid_agg_rx->head_seq_num);
reinette chatre
Tested-byRe: [PATCH v2 3/5] mac80211: correctly place aMPDU RX reorder code
Hi Johannes,
Quoted 9 lines · Johannes Berg
--- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rx.c static void ieee80211_release_reorder_fr · line 576
Quoted 8 lines
net/mac80211/rx.c +1
-1@@ -570,7 +570,7 @@ static void ieee80211_release_reorder_fr rate = &sband->bitrates[status->rate_idx]; tid_agg_rx->stored_mpdu_num--; tid_agg_rx->reorder_buf[index] =NULL ; -skb_queue_tail (frames, skb); +__skb_queue_tail (frames, skb); no_frame: tid_agg_rx->head_seq_num =seq_inc (tid_agg_rx->head_seq_num);
Thank you very much for looking into this so promptly. This patch fixes the problem.
Reinette
Johannes Berg
maintainerPATCH v2 4/5 mac80211: make station management completely depend on vif
In reply to Johannes BergThe station management currently uses the virtual interface, but you cannot add the same station to multiple virtual interfaces if you're communicating with it in multiple ways.
This restriction should be lifted so that in the future we can, for instance, support bluetooth 3 with an access point that mac80211 is already associated to.
We can do that by requiring all sta_info_get users to provide the virtual interface and making the RX code aware that an address may match more than one station struct. Thanks to the previous patches this one isn't all that large and except for the RX and TX status paths changes has low complexity.
---
v2: add missing sta_info_get()
net/mac80211/agg-rx.c | 3 - net/mac80211/agg-tx.c | 4 - net/mac80211/cfg.c | 25 +++------ net/mac80211/ibss.c | 2 net/mac80211/key.c | 2 net/mac80211/mesh_hwmp.c | 2 net/mac80211/mesh_plink.c | 4 - net/mac80211/mlme.c | 10 +-- net/mac80211/rx.c | 119 ++++++++++++++++++++++++---------------------- net/mac80211/sta_info.c | 18 ++++-- net/mac80211/sta_info.h | 29 ++++++++++- net/mac80211/status.c | 8 +-- net/mac80211/tx.c | 9 +-- 13 files changed, 134 insertions(+), 101 deletions(-)
net/mac80211/sta_info.h +27 -2
@@ -403,9 +403,34 @@ static inline u32 get_sta_flags(struct s#define STA_INFO_CLEANUP_INTERVAL (10 * HZ)/* -* Get a STA info, must have be under RCU read lock. +* Get a STA info, must be under RCU read lock. */ -struct sta_info *sta_info_get (struct ieee80211_local *local,const u8 *addr); +struct sta_info *sta_info_get (struct ieee80211_sub_if_data *sdata, +const u8 *addr); + +static inline +void for_each_sta_info_type_check (struct ieee80211_local *local, +const u8 *addr, +struct sta_info *sta, +struct sta_info *nxt) +{ +} + +#define for_each_sta_info (local, _addr, sta, nxt) \ + for (/* initialise loop */ \ + sta =rcu_dereference (local->sta_hash[STA_HASH (_addr)]),\ + nxt = sta ?rcu_dereference (sta->hnext) :NULL ; \ +/* typecheck */ \ +for_each_sta_info_type_check (local, (_addr), sta, nxt), \ +/* continue condition */ \ + sta; \ +/* advance loop */ \ + sta = nxt, \ + nxt = sta ? rcu_dereference(sta->hnext) : NULL \ + ) \ +/* compare address and run code only if it matches */ \ +if (memcmp (sta->sta.addr, (_addr),ETH_ALEN ) ==0 ) +/* * Get STA info by index, BROKEN! */
net/mac80211/sta_info.c +11 -7
@@ -103,13 +103,16 @@ static int sta_info_hash_del(struct ieee }/* protected by RCU */ -struct sta_info *sta_info_get (struct ieee80211_local *local,const u8 *addr) +struct sta_info *sta_info_get (struct ieee80211_sub_if_data *sdata, +const u8 *addr) { +struct ieee80211_local *local = sdata->local;struct sta_info *sta; sta =rcu_dereference (local->sta_hash[STA_HASH (addr)]);while (sta) { -if (memcmp (sta->sta.addr, addr,ETH_ALEN ) ==0 ) +if (sta->sdata == sdata && +memcmp (sta->sta.addr, addr,ETH_ALEN ) ==0 )break ; sta =rcu_dereference (sta->hnext); }
@@ -377,7 +380,7 @@ int sta_info_insert(struct sta_info *staspin_lock_irqsave (&local->sta_lock, flags);/* check if STA exists already */ -if (sta_info_get (local, sta->sta.addr)) { +if (sta_info_get (sdata, sta->sta.addr)) {spin_unlock_irqrestore (&local->sta_lock, flags); err = -EEXIST ; goto out_free;
@@ -843,11 +846,12 @@ void ieee80211_sta_expire(struct ieee802struct ieee80211_sta *ieee80211_find_sta_by_hw (struct ieee80211_hw *hw,const u8 *addr) { -struct sta_info *sta =sta_info_get (hw_to_local (hw), addr); +struct sta_info *sta, *nxt; -if (!sta) -return NULL ; -return &sta->sta; +/* Just return a random station ... first in list ... */ +for_each_sta_info (hw_to_local (hw), addr, sta, nxt) +return &sta->sta; +return NULL ; }EXPORT_SYMBOL_GPL (ieee80211_find_sta_by_hw);
net/mac80211/ibss.c +1 -1
@@ -252,7 +252,7 @@ static void ieee80211_rx_bss_info(structrcu_read_lock (); - sta =sta_info_get (local, mgmt->sa); + sta =sta_info_get (sdata, mgmt->sa);if (sta) {u32 prev_rates;
net/mac80211/key.c +1 -1
@@ -421,7 +421,7 @@ void ieee80211_key_link(struct ieee80211*/ /* same here, the AP could be using QoS */ - ap =sta_info_get (key->local, key->sdata->u.mgd.bssid); + ap =sta_info_get (key->sdata, key->sdata->u.mgd.bssid);if (ap) {if (test_sta_flags (ap,WLAN_STA_WME )) key->conf.flags |=
net/mac80211/mesh_hwmp.c +1 -1
@@ -335,7 +335,7 @@ static u32 hwmp_route_info_get(struct iebool process = true;rcu_read_lock (); - sta =sta_info_get (local, mgmt->sa); + sta =sta_info_get (sdata, mgmt->sa);if (!sta) {rcu_read_unlock ();return 0 ;
net/mac80211/mesh_plink.c +2 -2
@@ -234,7 +234,7 @@ void mesh_neighbour_update(u8 *hw_addr,rcu_read_lock (); - sta =sta_info_get (local, hw_addr); + sta =sta_info_get (sdata, hw_addr);if (!sta) { sta =mesh_plink_alloc (sdata, hw_addr, rates);if (!sta) {
@@ -455,7 +455,7 @@ void mesh_rx_plink_frame(struct ieee8021rcu_read_lock (); - sta =sta_info_get (local, mgmt->sa); + sta =sta_info_get (sdata, mgmt->sa);if (!sta && ftype !=PLINK_OPEN ) {mpl_dbg ("Mesh plink: cls or cnf from unknown peer\n" );rcu_read_unlock ();
net/mac80211/mlme.c +5 -5
@@ -202,7 +202,7 @@ static u32 ieee80211_enable_ht(struct ieieee80211_hw_config (local,0 );rcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (sta)rate_control_rate_update (local, sband, sta,IEEE80211_RC_HT_CHANGED );
@@ -1120,7 +1120,7 @@ static void ieee80211_set_disassoc(strucnetif_carrier_off (sdata->dev);rcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (sta)ieee80211_sta_tear_down_BA_sessions (sta);rcu_read_unlock ();
@@ -1159,7 +1159,7 @@ static void ieee80211_set_disassoc(strucrcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (!sta) {rcu_read_unlock ();return ;
@@ -1539,7 +1539,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeercu_read_lock ();/* Add STA entry for the AP */ - sta =sta_info_get (local, wk->bss->cbss.bssid); + sta =sta_info_get (sdata, wk->bss->cbss.bssid);if (!sta) { newsta = true;
@@ -1907,7 +1907,7 @@ static void ieee80211_rx_mgmt_beacon(strrcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (WARN_ON (!sta)) {rcu_read_unlock ();return ;
net/mac80211/rx.c +64 -55
153 lines not on this page · raw message
net/mac80211/agg-tx.c +2 -2
@@ -441,7 +441,7 @@ void ieee80211_start_tx_ba_cb(struct iee }rcu_read_lock (); - sta =sta_info_get (local, ra); + sta =sta_info_get (sdata, ra);if (!sta) {rcu_read_unlock ();#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -564,7 +564,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee#endif /* CONFIG_MAC80211_HT_DEBUG */ rcu_read_lock (); - sta =sta_info_get (local, ra); + sta =sta_info_get (sdata, ra);if (!sta) {#ifdef CONFIG_MAC80211_HT_DEBUG printk (KERN_DEBUG "Could not find station: %pM\n" , ra);
net/mac80211/agg-rx.c +1 -2
@@ -83,12 +83,11 @@ void __ieee80211_stop_rx_ba_session(struvoid ieee80211_sta_stop_rx_ba_session (struct ieee80211_sub_if_data *sdata,u8 *ra,u16 tid,u16 initiator,u16 reason) { -struct ieee80211_local *local = sdata->local;struct sta_info *sta;rcu_read_lock (); - sta =sta_info_get (local, ra); + sta =sta_info_get (sdata, ra);if (!sta) {rcu_read_unlock ();return ;
net/mac80211/cfg.c +10 -15
@@ -150,7 +150,7 @@ static int ieee80211_add_key(struct wiphrcu_read_lock ();if (mac_addr) { - sta =sta_info_get (sdata->local, mac_addr); + sta =sta_info_get (sdata, mac_addr);if (!sta) {ieee80211_key_free (key); err = -ENOENT ;
@@ -181,7 +181,7 @@ static int ieee80211_del_key(struct wiphif (mac_addr) { ret = -ENOENT ; - sta =sta_info_get (sdata->local, mac_addr); + sta =sta_info_get (sdata, mac_addr);if (!sta) goto out_unlock;
@@ -228,7 +228,7 @@ static int ieee80211_get_key(struct wiphrcu_read_lock ();if (mac_addr) { - sta =sta_info_get (sdata->local, mac_addr); + sta =sta_info_get (sdata, mac_addr);if (!sta) goto out;
@@ -414,15 +414,13 @@ static int ieee80211_dump_station(structstatic int ieee80211_get_station (struct wiphy *wiphy,struct net_device *dev,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 (); -/* XXX: verify sta->dev == dev */ - - sta =sta_info_get (local, mac); + sta =sta_info_get (sdata, mac);if (sta) { ret =0 ;sta_set_sinfo (sta, sinfo);
@@ -778,8 +776,7 @@ static int ieee80211_del_station(structif (mac) {rcu_read_lock (); -/* XXX: get sta belonging to dev */ - sta =sta_info_get (local, mac); + sta =sta_info_get (sdata, mac);if (!sta) {rcu_read_unlock ();return -ENOENT ;
@@ -800,14 +797,14 @@ static int ieee80211_change_station(struu8 *mac, struct station_parameters *params) { + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);struct ieee80211_local *local =wiphy_priv (wiphy);struct sta_info *sta;struct ieee80211_sub_if_data *vlansdata;rcu_read_lock (); -/* XXX: get sta belonging to dev */ - sta =sta_info_get (local, mac); + sta =sta_info_get (sdata, mac);if (!sta) {rcu_read_unlock ();return -ENOENT ;
@@ -846,7 +843,6 @@ static int ieee80211_change_station(strustatic int ieee80211_add_mpath (struct wiphy *wiphy,struct net_device *dev,u8 *dst,u8 *next_hop) { -struct ieee80211_local *local =wiphy_priv (wiphy);struct ieee80211_sub_if_data *sdata;struct mesh_path *mpath;struct sta_info *sta;
@@ -855,7 +851,7 @@ static int ieee80211_add_mpath(struct wi sdata =IEEE80211_DEV_TO_SUB_IF (dev);rcu_read_lock (); - sta =sta_info_get (local, next_hop); + sta =sta_info_get (sdata, next_hop);if (!sta) {rcu_read_unlock ();return -ENOENT ;
@@ -894,7 +890,6 @@ static int ieee80211_change_mpath(structstruct net_device *dev, u8 *dst, u8 *next_hop) { - struct ieee80211_local *local = wiphy_priv(wiphy); struct ieee80211_sub_if_data *sdata;struct mesh_path *mpath;struct sta_info *sta;
@@ -903,7 +898,7 @@ static int ieee80211_change_mpath(structrcu_read_lock (); - sta =sta_info_get (local, next_hop); + sta =sta_info_get (sdata, next_hop);if (!sta) {rcu_read_unlock ();return -ENOENT ;
net/mac80211/tx.c +4 -5
@@ -1054,7 +1054,7 @@ ieee80211_tx_prepare(struct ieee80211_suif (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) tx->sta =rcu_dereference (sdata->u.vlan.sta);if (!tx->sta) - tx->sta =sta_info_get (local, hdr->addr1); + tx->sta =sta_info_get (sdata, hdr->addr1);if (tx->sta &&ieee80211_is_data_qos (hdr->frame_control) && (local->hw.flags &IEEE80211_HW_AMPDU_AGGREGATION )) {
@@ -1760,9 +1760,8 @@ netdev_tx_t ieee80211_subif_start_xmit(s*/ if (!is_multicast_ether_addr (hdr.addr1)) {rcu_read_lock (); - sta =sta_info_get (local, hdr.addr1); -/* XXX: in the future, use sdata to look up the sta */ -if (sta && sta->sdata == sdata) + sta =sta_info_get (sdata, hdr.addr1); +if (sta) sta_flags =get_sta_flags (sta);rcu_read_unlock (); }
@@ -1921,7 +1920,7 @@ static bool ieee80211_tx_pending_skb(strieee80211_tx (sdata, skb, true); }else { hdr = (struct ieee80211_hdr *)skb->data; - sta =sta_info_get (local, hdr->addr1); + sta =sta_info_get (sdata, hdr->addr1); ret =__ieee80211_tx (local, &skb, sta, true);if (ret !=IEEE80211_TX_OK )
net/mac80211/status.c +5 -3
@@ -180,7 +180,7 @@ void ieee80211_tx_status(struct ieee8021struct ieee80211_tx_status_rtap_hdr *rthdr;struct ieee80211_sub_if_data *sdata;struct net_device *prev_dev =NULL ; -struct sta_info *sta; +struct sta_info *sta, *tmp;int retry_count =-1 , i;for (i =0 ; i <IEEE80211_TX_MAX_RATES ; i++) {
@@ -199,9 +199,11 @@ void ieee80211_tx_status(struct ieee8021 sband = local->hw.wiphy->bands[info->band]; - sta =sta_info_get (local, hdr->addr1); +for_each_sta_info (local, hdr->addr1, sta, tmp) { +/* skip wrong virtual interface */ +if (memcmp (hdr->addr2, sta->sdata->dev->dev_addr,ETH_ALEN )) +continue ; -if (sta) {if (!(info->flags &IEEE80211_TX_STAT_ACK ) &&test_sta_flags (sta,WLAN_STA_PS_STA )) {/*
Johannes Berg
maintainerPATCH v3 4/5 mac80211: make station management completely depend on vif
The station management currently uses the virtual interface, but you cannot add the same station to multiple virtual interfaces if you're communicating with it in multiple ways.
This restriction should be lifted so that in the future we can, for instance, support bluetooth 3 with an access point that mac80211 is already associated to.
We can do that by requiring all sta_info_get users to provide the virtual interface and making the RX code aware that an address may match more than one station struct. Thanks to the previous patches this one isn't all that large and except for the RX and TX status paths changes has low complexity.
---
v2: add missing sta_info_get()
v3: diff against the right tree
net/mac80211/agg-rx.c | 3 - net/mac80211/agg-tx.c | 4 - net/mac80211/cfg.c | 25 +++------ net/mac80211/ibss.c | 2 net/mac80211/key.c | 2 net/mac80211/mesh_hwmp.c | 2 net/mac80211/mesh_plink.c | 4 - net/mac80211/mlme.c | 10 +-- net/mac80211/rx.c | 119 ++++++++++++++++++++++++---------------------- net/mac80211/sta_info.c | 18 ++++-- net/mac80211/sta_info.h | 29 ++++++++++- net/mac80211/status.c | 8 +-- net/mac80211/tx.c | 9 +-- 13 files changed, 134 insertions(+), 101 deletions(-)
net/mac80211/sta_info.h +27 -2
@@ -403,9 +403,34 @@ static inline u32 get_sta_flags(struct s#define STA_INFO_CLEANUP_INTERVAL (10 * HZ)/* -* Get a STA info, must have be under RCU read lock. +* Get a STA info, must be under RCU read lock. */ -struct sta_info *sta_info_get (struct ieee80211_local *local,const u8 *addr); +struct sta_info *sta_info_get (struct ieee80211_sub_if_data *sdata, +const u8 *addr); + +static inline +void for_each_sta_info_type_check (struct ieee80211_local *local, +const u8 *addr, +struct sta_info *sta, +struct sta_info *nxt) +{ +} + +#define for_each_sta_info (local, _addr, sta, nxt) \ + for (/* initialise loop */ \ + sta =rcu_dereference (local->sta_hash[STA_HASH (_addr)]),\ + nxt = sta ?rcu_dereference (sta->hnext) :NULL ; \ +/* typecheck */ \ +for_each_sta_info_type_check (local, (_addr), sta, nxt), \ +/* continue condition */ \ + sta; \ +/* advance loop */ \ + sta = nxt, \ + nxt = sta ? rcu_dereference(sta->hnext) : NULL \ + ) \ +/* compare address and run code only if it matches */ \ +if (memcmp (sta->sta.addr, (_addr),ETH_ALEN ) ==0 ) +/* * Get STA info by index, BROKEN! */
net/mac80211/sta_info.c +11 -7
@@ -103,13 +103,16 @@ static int sta_info_hash_del(struct ieee }/* protected by RCU */ -struct sta_info *sta_info_get (struct ieee80211_local *local,const u8 *addr) +struct sta_info *sta_info_get (struct ieee80211_sub_if_data *sdata, +const u8 *addr) { +struct ieee80211_local *local = sdata->local;struct sta_info *sta; sta =rcu_dereference (local->sta_hash[STA_HASH (addr)]);while (sta) { -if (memcmp (sta->sta.addr, addr,ETH_ALEN ) ==0 ) +if (sta->sdata == sdata && +memcmp (sta->sta.addr, addr,ETH_ALEN ) ==0 )break ; sta =rcu_dereference (sta->hnext); }
@@ -377,7 +380,7 @@ int sta_info_insert(struct sta_info *staspin_lock_irqsave (&local->sta_lock, flags);/* check if STA exists already */ -if (sta_info_get (local, sta->sta.addr)) { +if (sta_info_get (sdata, sta->sta.addr)) {spin_unlock_irqrestore (&local->sta_lock, flags); err = -EEXIST ; goto out_free;
@@ -843,11 +846,12 @@ void ieee80211_sta_expire(struct ieee802struct ieee80211_sta *ieee80211_find_sta_by_hw (struct ieee80211_hw *hw,const u8 *addr) { -struct sta_info *sta =sta_info_get (hw_to_local (hw), addr); +struct sta_info *sta, *nxt; -if (!sta) -return NULL ; -return &sta->sta; +/* Just return a random station ... first in list ... */ +for_each_sta_info (hw_to_local (hw), addr, sta, nxt) +return &sta->sta; +return NULL ; }EXPORT_SYMBOL_GPL (ieee80211_find_sta_by_hw);
net/mac80211/ibss.c +1 -1
@@ -252,7 +252,7 @@ static void ieee80211_rx_bss_info(structrcu_read_lock (); - sta =sta_info_get (local, mgmt->sa); + sta =sta_info_get (sdata, mgmt->sa);if (sta) {u32 prev_rates;
net/mac80211/key.c +1 -1
@@ -421,7 +421,7 @@ void ieee80211_key_link(struct ieee80211*/ /* same here, the AP could be using QoS */ - ap =sta_info_get (key->local, key->sdata->u.mgd.bssid); + ap =sta_info_get (key->sdata, key->sdata->u.mgd.bssid);if (ap) {if (test_sta_flags (ap,WLAN_STA_WME )) key->conf.flags |=
net/mac80211/mesh_hwmp.c +1 -1
@@ -335,7 +335,7 @@ static u32 hwmp_route_info_get(struct iebool process = true;rcu_read_lock (); - sta =sta_info_get (local, mgmt->sa); + sta =sta_info_get (sdata, mgmt->sa);if (!sta) {rcu_read_unlock ();return 0 ;
net/mac80211/mesh_plink.c +2 -2
@@ -234,7 +234,7 @@ void mesh_neighbour_update(u8 *hw_addr,rcu_read_lock (); - sta =sta_info_get (local, hw_addr); + sta =sta_info_get (sdata, hw_addr);if (!sta) { sta =mesh_plink_alloc (sdata, hw_addr, rates);if (!sta) {
@@ -455,7 +455,7 @@ void mesh_rx_plink_frame(struct ieee8021rcu_read_lock (); - sta =sta_info_get (local, mgmt->sa); + sta =sta_info_get (sdata, mgmt->sa);if (!sta && ftype !=PLINK_OPEN ) {mpl_dbg ("Mesh plink: cls or cnf from unknown peer\n" );rcu_read_unlock ();
net/mac80211/mlme.c +5 -5
@@ -202,7 +202,7 @@ static u32 ieee80211_enable_ht(struct ieieee80211_hw_config (local,0 );rcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (sta)rate_control_rate_update (local, sband, sta,IEEE80211_RC_HT_CHANGED );
@@ -1070,7 +1070,7 @@ static void ieee80211_set_disassoc(strucnetif_carrier_off (sdata->dev);rcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (sta)ieee80211_sta_tear_down_BA_sessions (sta);rcu_read_unlock ();
@@ -1109,7 +1109,7 @@ static void ieee80211_set_disassoc(strucrcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (!sta) {rcu_read_unlock ();return ;
@@ -1489,7 +1489,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeercu_read_lock ();/* Add STA entry for the AP */ - sta =sta_info_get (local, wk->bss->cbss.bssid); + sta =sta_info_get (sdata, wk->bss->cbss.bssid);if (!sta) { newsta = true;
@@ -1857,7 +1857,7 @@ static void ieee80211_rx_mgmt_beacon(strrcu_read_lock (); - sta =sta_info_get (local, bssid); + sta =sta_info_get (sdata, bssid);if (WARN_ON (!sta)) {rcu_read_unlock ();return ;
net/mac80211/rx.c +64 -55
153 lines not on this page · raw message
net/mac80211/agg-tx.c +2 -2
@@ -437,7 +437,7 @@ void ieee80211_start_tx_ba_cb(struct iee }rcu_read_lock (); - sta =sta_info_get (local, ra); + sta =sta_info_get (sdata, ra);if (!sta) {rcu_read_unlock ();#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -565,7 +565,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee#endif /* CONFIG_MAC80211_HT_DEBUG */ rcu_read_lock (); - sta =sta_info_get (local, ra); + sta =sta_info_get (sdata, ra);if (!sta) {#ifdef CONFIG_MAC80211_HT_DEBUG printk (KERN_DEBUG "Could not find station: %pM\n" , ra);
net/mac80211/agg-rx.c +1 -2
@@ -83,7 +83,6 @@ void __ieee80211_stop_rx_ba_session(struvoid ieee80211_sta_stop_rx_ba_session (struct ieee80211_sub_if_data *sdata,u8 *ra,u16 tid,u16 initiator,u16 reason) { -struct ieee80211_local *local = sdata->local;struct sta_info *sta;/* stop HW Rx aggregation. ampdu_action existence
@@ -92,7 +91,7 @@ void ieee80211_sta_stop_rx_ba_session(strcu_read_lock (); - sta =sta_info_get (local, ra); + sta =sta_info_get (sdata, ra);if (!sta) {rcu_read_unlock ();return ;
net/mac80211/cfg.c +10 -15
@@ -150,7 +150,7 @@ static int ieee80211_add_key(struct wiphrcu_read_lock ();if (mac_addr) { - sta =sta_info_get (sdata->local, mac_addr); + sta =sta_info_get (sdata, mac_addr);if (!sta) {ieee80211_key_free (key); err = -ENOENT ;
@@ -181,7 +181,7 @@ static int ieee80211_del_key(struct wiphif (mac_addr) { ret = -ENOENT ; - sta =sta_info_get (sdata->local, mac_addr); + sta =sta_info_get (sdata, mac_addr);if (!sta) goto out_unlock;
@@ -228,7 +228,7 @@ static int ieee80211_get_key(struct wiphrcu_read_lock ();if (mac_addr) { - sta =sta_info_get (sdata->local, mac_addr); + sta =sta_info_get (sdata, mac_addr);if (!sta) goto out;
@@ -414,15 +414,13 @@ static int ieee80211_dump_station(structstatic int ieee80211_get_station (struct wiphy *wiphy,struct net_device *dev,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 (); -/* XXX: verify sta->dev == dev */ - - sta =sta_info_get (local, mac); + sta =sta_info_get (sdata, mac);if (sta) { ret =0 ;sta_set_sinfo (sta, sinfo);
@@ -778,8 +776,7 @@ static int ieee80211_del_station(structif (mac) {rcu_read_lock (); -/* XXX: get sta belonging to dev */ - sta =sta_info_get (local, mac); + sta =sta_info_get (sdata, mac);if (!sta) {rcu_read_unlock ();return -ENOENT ;
@@ -800,14 +797,14 @@ static int ieee80211_change_station(struu8 *mac, struct station_parameters *params) { + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);struct ieee80211_local *local =wiphy_priv (wiphy);struct sta_info *sta;struct ieee80211_sub_if_data *vlansdata;rcu_read_lock (); -/* XXX: get sta belonging to dev */ - sta =sta_info_get (local, mac); + sta =sta_info_get (sdata, mac);if (!sta) {rcu_read_unlock ();return -ENOENT ;
@@ -846,7 +843,6 @@ static int ieee80211_change_station(strustatic int ieee80211_add_mpath (struct wiphy *wiphy,struct net_device *dev,u8 *dst,u8 *next_hop) { -struct ieee80211_local *local =wiphy_priv (wiphy);struct ieee80211_sub_if_data *sdata;struct mesh_path *mpath;struct sta_info *sta;
@@ -855,7 +851,7 @@ static int ieee80211_add_mpath(struct wi sdata =IEEE80211_DEV_TO_SUB_IF (dev);rcu_read_lock (); - sta =sta_info_get (local, next_hop); + sta =sta_info_get (sdata, next_hop);if (!sta) {rcu_read_unlock ();return -ENOENT ;
@@ -894,7 +890,6 @@ static int ieee80211_change_mpath(structstruct net_device *dev, u8 *dst, u8 *next_hop) { - struct ieee80211_local *local = wiphy_priv(wiphy); struct ieee80211_sub_if_data *sdata;struct mesh_path *mpath;struct sta_info *sta;
@@ -903,7 +898,7 @@ static int ieee80211_change_mpath(structrcu_read_lock (); - sta =sta_info_get (local, next_hop); + sta =sta_info_get (sdata, next_hop);if (!sta) {rcu_read_unlock ();return -ENOENT ;
net/mac80211/tx.c +4 -5
@@ -1054,7 +1054,7 @@ ieee80211_tx_prepare(struct ieee80211_suif (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) tx->sta =rcu_dereference (sdata->u.vlan.sta);if (!tx->sta) - tx->sta =sta_info_get (local, hdr->addr1); + tx->sta =sta_info_get (sdata, hdr->addr1);if (tx->sta &&ieee80211_is_data_qos (hdr->frame_control) && (local->hw.flags &IEEE80211_HW_AMPDU_AGGREGATION )) {
@@ -1760,9 +1760,8 @@ netdev_tx_t ieee80211_subif_start_xmit(s*/ if (!is_multicast_ether_addr (hdr.addr1)) {rcu_read_lock (); - sta =sta_info_get (local, hdr.addr1); -/* XXX: in the future, use sdata to look up the sta */ -if (sta && sta->sdata == sdata) + sta =sta_info_get (sdata, hdr.addr1); +if (sta) sta_flags =get_sta_flags (sta);rcu_read_unlock (); }
@@ -1921,7 +1920,7 @@ static bool ieee80211_tx_pending_skb(strieee80211_tx (sdata, skb, true); }else { hdr = (struct ieee80211_hdr *)skb->data; - sta =sta_info_get (local, hdr->addr1); + sta =sta_info_get (sdata, hdr->addr1); ret =__ieee80211_tx (local, &skb, sta, true);if (ret !=IEEE80211_TX_OK )
net/mac80211/status.c +5 -3
@@ -146,7 +146,7 @@ void ieee80211_tx_status(struct ieee8021struct ieee80211_tx_status_rtap_hdr *rthdr;struct ieee80211_sub_if_data *sdata;struct net_device *prev_dev =NULL ; -struct sta_info *sta; +struct sta_info *sta, *tmp;int retry_count =-1 , i;for (i =0 ; i <IEEE80211_TX_MAX_RATES ; i++) {
@@ -165,9 +165,11 @@ void ieee80211_tx_status(struct ieee8021 sband = local->hw.wiphy->bands[info->band]; - sta =sta_info_get (local, hdr->addr1); +for_each_sta_info (local, hdr->addr1, sta, tmp) { +/* skip wrong virtual interface */ +if (memcmp (hdr->addr2, sta->sdata->dev->dev_addr,ETH_ALEN )) +continue ; -if (sta) {if (!(info->flags &IEEE80211_TX_STAT_ACK ) &&test_sta_flags (sta,WLAN_STA_PS_STA )) {/*
Johannes Berg
maintainerRe: [PATCH v3 4/5] mac80211: make station management completely depend on vif
On Wed, 2009-11-25 at 20:27 +0100, Johannes Berg wrote:
...
Quoted 4 lines
Signed-off-by Johannes Berg <[email protected]>---
v2: add missingsta_info_get()
v3: diff against the right tree
FWIW, the wrong tree here was with the security fix included, so you'll now want to pick up v2 instead again.
johannes
Johannes Berg
maintainerPATCH v2 5/5 mac80211: reduce reliance on netdev
In reply to Johannes BergFor bluetooth 3, we will most likely not have a netdev for a virtual interface (sdata), so prepare for that by reducing the reliance on having a netdev. This patch moves the name and address fields into the sdata struct and uses them from there all over. Some work is needed to keep them sync'ed, but that's not a lot of work and in slow paths anyway.
In doing so, this also reduces the number of pointer dereferences in many places, because of things like sdata->dev->dev_addr becoming sdata->vif.addr.
--- include/net/mac80211.h | 2 + net/mac80211/agg-rx.c | 6 ++-- net/mac80211/agg-tx.c | 14 ++++----- net/mac80211/cfg.c | 2 - net/mac80211/debugfs_key.c | 2 - net/mac80211/debugfs_netdev.c | 55 +++---------------------------------- net/mac80211/debugfs_netdev.h | 9 ++---- net/mac80211/debugfs_sta.c | 2 - net/mac80211/driver-ops.h | 4 +- net/mac80211/driver-trace.h | 12 +++----- net/mac80211/ht.c | 6 ++-- net/mac80211/ibss.c | 32 ++++++++++----------- net/mac80211/ieee80211_i.h | 5 ++- net/mac80211/iface.c | 62 +++++++++++++++++++++++++++++++++++++++--- net/mac80211/main.c | 17 ++++++++--- net/mac80211/mesh.c | 4 +- net/mac80211/mesh_hwmp.c | 18 ++++++------ net/mac80211/mesh_pathtbl.c | 6 ++-- net/mac80211/mesh_plink.c | 2 - net/mac80211/mlme.c | 62 +++++++++++++++++++++--------------------- net/mac80211/pm.c | 2 - net/mac80211/rx.c | 43 ++++++++++++++--------------- net/mac80211/scan.c | 2 - net/mac80211/spectmgmt.c | 4 +- net/mac80211/sta_info.c | 8 ++--- net/mac80211/status.c | 2 - net/mac80211/tx.c | 33 ++++++++++------------ net/mac80211/util.c | 14 ++++----- 28 files changed, 223 insertions(+), 207 deletions(-)
net/mac80211/agg-rx.c +3 -3
@@ -135,7 +135,7 @@ static void ieee80211_send_addba_resp(stif (!skb) {printk (KERN_DEBUG "%s: failed to allocate buffer " -"for addba resp frame\n" , sdata->dev->name); +"for addba resp frame\n" , sdata->name);return ; }
@@ -143,10 +143,10 @@ static void ieee80211_send_addba_resp(st mgmt = (struct ieee80211_mgmt *)skb_put (skb,24 );memset (mgmt,0 ,24 );memcpy (mgmt->da, da,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );if (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) -memcpy (mgmt->bssid, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->bssid, sdata->vif.addr,ETH_ALEN );else if (sdata->vif.type ==NL80211_IFTYPE_STATION )memcpy (mgmt->bssid, sdata->u.mgd.bssid,ETH_ALEN );
net/mac80211/agg-tx.c +7 -7
@@ -58,17 +58,17 @@ static void ieee80211_send_addba_requestif (!skb) {printk (KERN_ERR "%s: failed to allocate buffer " -"for addba request frame\n" , sdata->dev->name); +"for addba request frame\n" , sdata->name);return ; }skb_reserve (skb, local->hw.extra_tx_headroom); mgmt = (struct ieee80211_mgmt *)skb_put (skb,24 );memset (mgmt,0 ,24 );memcpy (mgmt->da, da,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );if (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) -memcpy (mgmt->bssid, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->bssid, sdata->vif.addr,ETH_ALEN );else if (sdata->vif.type ==NL80211_IFTYPE_STATION )memcpy (mgmt->bssid, sdata->u.mgd.bssid,ETH_ALEN );
@@ -104,7 +104,7 @@ void ieee80211_send_bar(struct ieee80211 skb =dev_alloc_skb (sizeof (*bar) + local->hw.extra_tx_headroom);if (!skb) {printk (KERN_ERR "%s: failed to allocate buffer for " -"bar frame\n" , sdata->dev->name); +"bar frame\n" , sdata->name);return ; }skb_reserve (skb, local->hw.extra_tx_headroom);
@@ -113,7 +113,7 @@ void ieee80211_send_bar(struct ieee80211 bar->frame_control =cpu_to_le16 (IEEE80211_FTYPE_CTL |IEEE80211_STYPE_BACK_REQ );memcpy (bar->ra, ra,ETH_ALEN ); -memcpy (bar->ta, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (bar->ta, sdata->vif.addr,ETH_ALEN ); bar_control |= (u16 )IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL ; bar_control |= (u16 )IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA ; bar_control |= (u16)(tid <<12 );
@@ -489,7 +489,7 @@ void ieee80211_start_tx_ba_cb_irqsafe(st#ifdef CONFIG_MAC80211_HT_DEBUG if (net_ratelimit ())printk (KERN_WARNING "%s: Not enough memory, " -"dropping start BA session" , skb->dev->name); +"dropping start BA session" , sdata->name);#endif return ; }
@@ -621,7 +621,7 @@ void ieee80211_stop_tx_ba_cb_irqsafe(str#ifdef CONFIG_MAC80211_HT_DEBUG if (net_ratelimit ())printk (KERN_WARNING "%s: Not enough memory, " -"dropping stop BA session" , skb->dev->name); +"dropping stop BA session" , sdata->name);#endif return ; }
net/mac80211/ht.c +3 -3
@@ -106,7 +106,7 @@ void ieee80211_send_delba(struct ieee802if (!skb) {printk (KERN_ERR "%s: failed to allocate buffer " -"for delba frame\n" , sdata->dev->name); +"for delba frame\n" , sdata->name);return ; }
@@ -114,10 +114,10 @@ void ieee80211_send_delba(struct ieee802 mgmt = (struct ieee80211_mgmt *)skb_put (skb,24 );memset (mgmt,0 ,24 );memcpy (mgmt->da, da,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );if (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) -memcpy (mgmt->bssid, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->bssid, sdata->vif.addr,ETH_ALEN );else if (sdata->vif.type ==NL80211_IFTYPE_STATION )memcpy (mgmt->bssid, sdata->u.mgd.bssid,ETH_ALEN );
net/mac80211/ibss.c +16 -16
@@ -117,7 +117,7 @@ static void __ieee80211_sta_join_ibss(st mgmt->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_PROBE_RESP );memset (mgmt->da,0xff ,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );memcpy (mgmt->bssid, ifibss->bssid,ETH_ALEN ); mgmt->u.beacon.beacon_int =cpu_to_le16 (beacon_int); mgmt->u.beacon.timestamp =cpu_to_le64 (tsf);
@@ -266,7 +266,7 @@ static void ieee80211_rx_bss_info(struct printk(KERN_DEBUG "%s: updated supp_rates set " "for %pM based on beacon info (0x%llx | " "0x%llx -> 0x%llx)\n", - sdata->dev->name, + sdata->name, sta->sta.addr, (unsigned long long) prev_rates, (unsigned long long) supp_rates,
@@ -364,7 +364,7 @@ static void ieee80211_rx_bss_info(struct#ifdef CONFIG_MAC80211_IBSS_DEBUG printk (KERN_DEBUG "%s: beacon TSF higher than " "local TSF - IBSS merge with BSSID %pM\n" , - sdata->dev->name, mgmt->bssid); + sdata->name, mgmt->bssid);#endif ieee80211_sta_join_ibss (sdata, bss);ieee80211_ibss_add_sta (sdata, mgmt->bssid, mgmt->sa, supp_rates);
@@ -393,7 +393,7 @@ struct sta_info *ieee80211_ibss_add_sta(if (local->num_sta >=IEEE80211_IBSS_MAX_STA_ENTRIES ) {if (net_ratelimit ())printk (KERN_DEBUG "%s: No room for a new IBSS STA entry %pM\n" , - sdata->dev->name, addr); + sdata->name, addr);return NULL ; }
@@ -402,7 +402,7 @@ struct sta_info *ieee80211_ibss_add_sta(#ifdef CONFIG_MAC80211_VERBOSE_DEBUG printk (KERN_DEBUG "%s: Adding new IBSS station %pM (dev=%s)\n" , -wiphy_name (local->hw.wiphy), addr, sdata->dev->name); +wiphy_name (local->hw.wiphy), addr, sdata->name);#endif sta =sta_info_alloc (sdata, addr,GFP_ATOMIC );
@@ -466,7 +466,7 @@ static void ieee80211_sta_merge_ibss(strreturn ;printk (KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " -"IBSS networks with same SSID (merge)\n" , sdata->dev->name); +"IBSS networks with same SSID (merge)\n" , sdata->name);ieee80211_request_internal_scan (sdata, ifibss->ssid, ifibss->ssid_len); }
@@ -488,13 +488,13 @@ static void ieee80211_sta_create_ibss(st* random number generator get different BSSID. */ get_random_bytes (bssid,ETH_ALEN );for (i =0 ; i <ETH_ALEN ; i++) - bssid[i] ^= sdata->dev->dev_addr[i]; + bssid[i] ^= sdata->vif.addr[i]; bssid[0 ] &= ~0x01 ; bssid[0 ] |=0x02 ; }printk (KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n" , - sdata->dev->name, bssid); + sdata->name, bssid); sband = local->hw.wiphy->bands[ifibss->channel->band];
@@ -523,7 +523,7 @@ static void ieee80211_sta_find_ibss(stru active_ibss =ieee80211_sta_active_ibss (sdata);#ifdef CONFIG_MAC80211_IBSS_DEBUG printk (KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n" , - sdata->dev->name, active_ibss); + sdata->name, active_ibss);#endif /* CONFIG_MAC80211_IBSS_DEBUG */ if (active_ibss)
@@ -552,7 +552,7 @@ static void ieee80211_sta_find_ibss(struprintk (KERN_DEBUG "%s: Selected IBSS BSSID %pM" " based on configured SSID\n" , - sdata->dev->name, bss->cbss.bssid); + sdata->name, bss->cbss.bssid);ieee80211_sta_join_ibss (sdata, bss);ieee80211_rx_bss_put (local, bss);
@@ -571,7 +571,7 @@ static void ieee80211_sta_find_ibss(stru }else if (time_after (jiffies, ifibss->last_scan_completed +IEEE80211_SCAN_INTERVAL )) {printk (KERN_DEBUG "%s: Trigger new scan to find an IBSS to " -"join\n" , sdata->dev->name); +"join\n" , sdata->name);ieee80211_request_internal_scan (sdata, ifibss->ssid, ifibss->ssid_len);
@@ -585,7 +585,7 @@ static void ieee80211_sta_find_ibss(strureturn ; }printk (KERN_DEBUG "%s: IBSS not allowed on" -" %d MHz\n" , sdata->dev->name, +" %d MHz\n" , sdata->name, local->hw.conf.channel->center_freq);/* No IBSS found - decrease scan interval and continue
@@ -619,7 +619,7 @@ static void ieee80211_rx_mgmt_probe_req(#ifdef CONFIG_MAC80211_IBSS_DEBUG printk (KERN_DEBUG "%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM" " (tx_last_beacon=%d)\n" , - sdata->dev->name, mgmt->sa, mgmt->da, + sdata->name, mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);#endif /* CONFIG_MAC80211_IBSS_DEBUG */
@@ -637,7 +637,7 @@ static void ieee80211_rx_mgmt_probe_req(#ifdef CONFIG_MAC80211_IBSS_DEBUG printk (KERN_DEBUG "%s: Invalid SSID IE in ProbeReq " "from %pM\n" , - sdata->dev->name, mgmt->sa); + sdata->name, mgmt->sa);#endif return ; }
@@ -657,7 +657,7 @@ static void ieee80211_rx_mgmt_probe_req(memcpy (resp->da, mgmt->sa,ETH_ALEN );#ifdef CONFIG_MAC80211_IBSS_DEBUG printk (KERN_DEBUG "%s: Sending ProbeResp to %pM\n" , - sdata->dev->name, resp->da); + sdata->name, resp->da);#endif /* CONFIG_MAC80211_IBSS_DEBUG */ IEEE80211_SKB_CB (skb)->flags |=IEEE80211_TX_INTFL_DONT_ENCRYPT ;ieee80211_tx_skb (sdata, skb);
@@ -671,7 +671,7 @@ static void ieee80211_rx_mgmt_probe_respsize_t baselen;struct ieee802_11_elems elems; -if (memcmp (mgmt->da, sdata->dev->dev_addr,ETH_ALEN )) +if (memcmp (mgmt->da, sdata->vif.addr,ETH_ALEN ))return ;/* ignore ProbeResp to foreign address */ baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
net/mac80211/status.c +1 -1
@@ -167,7 +167,7 @@ void ieee80211_tx_status(struct ieee8021for_each_sta_info (local, hdr->addr1, sta, tmp) {/* skip wrong virtual interface */ -if (memcmp (hdr->addr2, sta->sdata->dev->dev_addr,ETH_ALEN )) +if (memcmp (hdr->addr2, sta->sdata->vif.addr,ETH_ALEN ))continue ; if (!(info->flags & IEEE80211_TX_STAT_ACK) &&
net/mac80211/main.c +12 -5
@@ -32,7 +32,6 @@#include "led.h" #include "cfg.h" #include "debugfs.h" -#include "debugfs_netdev.h" void ieee80211_configure_filter (struct ieee80211_local *local) {
@@ -173,7 +172,7 @@ void ieee80211_bss_info_change_notify(st }else if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;else if (sdata->vif.type ==NL80211_IFTYPE_AP ) - sdata->vif.bss_conf.bssid = sdata->dev->dev_addr; + sdata->vif.bss_conf.bssid = sdata->vif.addr;else if (ieee80211_vif_is_mesh (&sdata->vif)) { sdata->vif.bss_conf.bssid = zero; }else {
@@ -672,11 +671,19 @@ static int __init ieee80211_init(void) ret =rc80211_pid_init ();if (ret) -return ret; + goto err_pid; -ieee80211_debugfs_netdev_init (); + ret =ieee80211_iface_init (); +if (ret) + goto err_netdev;return 0 ; + err_netdev: +rc80211_pid_exit (); + err_pid: +rc80211_minstrel_exit (); + +return ret; } static void __exit ieee80211_exit(void)
@@ -693,7 +700,7 @@ static void __exit ieee80211_exit(void)if (mesh_allocated)ieee80211s_stop (); -ieee80211_debugfs_netdev_exit (); +ieee80211_iface_exit (); }
net/mac80211/mesh.c +2 -2
@@ -457,7 +457,7 @@ static void ieee80211_mesh_housekeeping(#ifdef CONFIG_MAC80211_VERBOSE_DEBUG printk (KERN_DEBUG "%s: running mesh housekeeping\n" , - sdata->dev->name); + sdata->name);#endif ieee80211_sta_expire (sdata,IEEE80211_MESH_PEER_INACTIVITY_LIMIT );
@@ -565,7 +565,7 @@ static void ieee80211_mesh_rx_bcn_presp(/* ignore ProbeResp to foreign address */ if (stype ==IEEE80211_STYPE_PROBE_RESP && -compare_ether_addr (mgmt->da, sdata->dev->dev_addr)) +compare_ether_addr (mgmt->da, sdata->vif.addr))return ; baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
net/mac80211/mesh_hwmp.c +9 -9
@@ -128,9 +128,9 @@ static int mesh_path_sel_frame_tx(enum m IEEE80211_STYPE_ACTION);memcpy (mgmt->da, da,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );/* BSSID == SA */ -memcpy (mgmt->bssid, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->bssid, sdata->vif.addr,ETH_ALEN ); mgmt->u.action.category =MESH_PATH_SEL_CATEGORY ; mgmt->u.action.u.mesh_action.action_code =MESH_PATH_SEL_ACTION ;
@@ -222,7 +222,7 @@ int mesh_path_error_tx(u8 ttl, u8 *targe IEEE80211_STYPE_ACTION);memcpy (mgmt->da, ra,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );/* BSSID is left zeroed, wildcard value */ mgmt->u.action.category =MESH_PATH_SEL_CATEGORY ; mgmt->u.action.u.mesh_action.action_code =MESH_PATH_SEL_ACTION ;
@@ -374,7 +374,7 @@ static u32 hwmp_route_info_get(struct ie new_metric =MAX_METRIC ; exp_time =TU_TO_EXP_TIME (orig_lifetime); -if (memcmp (orig_addr, sdata->dev->dev_addr,ETH_ALEN ) ==0 ) { +if (memcmp (orig_addr, sdata->vif.addr,ETH_ALEN ) ==0 ) {/* This MP is the originator, we are not interested in this * frame, except for updating transmitter's path info. */
@@ -486,7 +486,7 @@ static void hwmp_preq_frame_process(strumhwmp_dbg ("received PREQ from %pM\n" , orig_addr); -if (memcmp (target_addr, sdata->dev->dev_addr,ETH_ALEN ) ==0 ) { +if (memcmp (target_addr, sdata->vif.addr,ETH_ALEN ) ==0 ) {mhwmp_dbg ("PREQ is for us\n" ); forward = false; reply = true;
@@ -579,7 +579,7 @@ static void hwmp_prep_frame_process(stru* replies */ target_addr =PREP_IE_TARGET_ADDR (prep_elem); -if (memcmp (target_addr, sdata->dev->dev_addr,ETH_ALEN ) ==0 ) +if (memcmp (target_addr, sdata->vif.addr,ETH_ALEN ) ==0 )/* destination, no forwarding required */ return ;
@@ -890,7 +890,7 @@ void mesh_path_start_discovery(struct ie target_flags =MP_F_RF ;spin_unlock_bh (&mpath->state_lock); - mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->dev->dev_addr, + mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->vif.addr, cpu_to_le32(ifmsh->sn), target_flags, mpath->dst, cpu_to_le32(mpath->sn), broadcast_addr, 0, ttl, cpu_to_le32(lifetime), 0,
@@ -938,7 +938,7 @@ int mesh_nexthop_lookup(struct sk_buff *if (mpath->flags &MESH_PATH_ACTIVE ) {if (time_after (jiffies, mpath->exp_time +msecs_to_jiffies (sdata->u.mesh.mshcfg.path_refresh_time)) - && !memcmp (sdata->dev->dev_addr, hdr->addr4, + && !memcmp (sdata->vif.addr, hdr->addr4,ETH_ALEN ) && !(mpath->flags &MESH_PATH_RESOLVING ) && !(mpath->flags &MESH_PATH_FIXED )) {
@@ -1011,7 +1011,7 @@ mesh_path_tx_root_frame(struct ieee80211 {struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; -mesh_path_sel_frame_tx (MPATH_RANN ,0 , sdata->dev->dev_addr, +mesh_path_sel_frame_tx (MPATH_RANN ,0 , sdata->vif.addr,cpu_to_le32 (++ifmsh->sn),0 ,NULL ,0 , broadcast_addr,0 ,MESH_TTL ,0 ,0 ,0 , sdata);
net/mac80211/mesh_pathtbl.c +3 -3
@@ -260,7 +260,7 @@ int mesh_path_add(u8 *dst, struct ieee80int err =0 ;u32 hash_idx; -if (memcmp (dst, sdata->dev->dev_addr,ETH_ALEN ) ==0 ) +if (memcmp (dst, sdata->vif.addr,ETH_ALEN ) ==0 )/* never add ourselves as neighbours */ return -ENOTSUPP ;
@@ -377,7 +377,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, strucint err =0 ;u32 hash_idx; -if (memcmp (dst, sdata->dev->dev_addr,ETH_ALEN ) ==0 ) +if (memcmp (dst, sdata->vif.addr,ETH_ALEN ) ==0 )/* never add ourselves as neighbours */ return -ENOTSUPP ;
@@ -605,7 +605,7 @@ void mesh_path_discard_frame(struct sk_bstruct mesh_path *mpath;u32 sn =0 ; -if (memcmp (hdr->addr4, sdata->dev->dev_addr,ETH_ALEN ) !=0 ) { +if (memcmp (hdr->addr4, sdata->vif.addr,ETH_ALEN ) !=0 ) {u8 *ra, *da; da = hdr->addr3;
net/mac80211/mesh_plink.c +1 -1
@@ -169,7 +169,7 @@ static int mesh_plink_frame_tx(struct ie mgmt->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_ACTION );memcpy (mgmt->da, da,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );/* BSSID is left zeroed, wildcard value */ mgmt->u.action.category =MESH_PLINK_CATEGORY ; mgmt->u.action.u.plink_action.action_code = action;
net/mac80211/mlme.c +31 -31
243 lines not on this page · raw message
net/mac80211/rx.c +21 -22
161 lines not on this page · raw message
net/mac80211/scan.c +1 -1
@@ -147,7 +147,7 @@ ieee80211_scan_rx(struct ieee80211_sub_i presp =ieee80211_is_probe_resp (fc);if (presp) {/* ignore ProbeResp to foreign address */ -if (memcmp (mgmt->da, sdata->dev->dev_addr,ETH_ALEN )) +if (memcmp (mgmt->da, sdata->vif.addr,ETH_ALEN ))return RX_DROP_MONITOR ; presp = true;
net/mac80211/spectmgmt.c +2 -2
@@ -35,7 +35,7 @@ static void ieee80211_send_refuse_measurif (!skb) {printk (KERN_ERR "%s: failed to allocate buffer for " -"measurement report frame\n" , sdata->dev->name); +"measurement report frame\n" , sdata->name);return ; }
@@ -43,7 +43,7 @@ static void ieee80211_send_refuse_measur msr_report = (struct ieee80211_mgmt *)skb_put (skb,24 );memset (msr_report,0 ,24 );memcpy (msr_report->da, da,ETH_ALEN ); -memcpy (msr_report->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (msr_report->sa, sdata->vif.addr,ETH_ALEN );memcpy (msr_report->bssid, bssid,ETH_ALEN ); msr_report->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_ACTION );
net/mac80211/sta_info.c +4 -4
@@ -372,7 +372,7 @@ int sta_info_insert(struct sta_info *sta goto out_free; } -if (WARN_ON (compare_ether_addr (sta->sta.addr, sdata->dev->dev_addr) ==0 || +if (WARN_ON (compare_ether_addr (sta->sta.addr, sdata->vif.addr) ==0 ||is_multicast_ether_addr (sta->sta.addr))) { err = -EINVAL ; goto out_free;
@@ -831,7 +831,7 @@ void ieee80211_sta_expire(struct ieee802if (time_after (jiffies, sta->last_rx + exp_time)) {#ifdef CONFIG_MAC80211_IBSS_DEBUG printk (KERN_DEBUG "%s: expiring inactive STA %pM\n" , - sdata->dev->name, sta->sta.addr); + sdata->name, sta->sta.addr);#endif __sta_info_unlink (&sta);if (sta)
@@ -889,7 +889,7 @@ void ieee80211_sta_ps_deliver_wakeup(str#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG printk (KERN_DEBUG "%s: STA %pM aid %d sending %d filtered/%d PS frames " -"since STA not sleeping anymore\n" , sdata->dev->name, +"since STA not sleeping anymore\n" , sdata->name, sta->sta.addr, sta->sta.aid, sent - buffered, buffered);#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ }
@@ -948,7 +948,7 @@ void ieee80211_sta_ps_deliver_poll_respo*/ printk (KERN_DEBUG "%s: STA %pM sent PS Poll even " "though there are no buffered frames for it\n" , - sdata->dev->name, sta->sta.addr); + sdata->name, sta->sta.addr);#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ } }
net/mac80211/tx.c +16 -17
@@ -223,7 +223,7 @@ ieee80211_tx_h_check_assoc(struct ieee80#ifdef CONFIG_MAC80211_VERBOSE_DEBUG printk (KERN_DEBUG "%s: dropped data frame to not " "associated station %pM\n" , - tx->dev->name, hdr->addr1); + tx->sdata->name, hdr->addr1);#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ I802_DEBUG_INC (tx->local->tx_handlers_drop_not_assoc);return TX_DROP ;
@@ -331,7 +331,7 @@ ieee80211_tx_h_multicast_ps_buf(struct i#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG if (net_ratelimit ())printk (KERN_DEBUG "%s: BC TX buffer full - dropping the oldest frame\n" , - tx->dev->name); + tx->sdata->name);#endif dev_kfree_skb (skb_dequeue (&tx->sdata->bss->ps_bc_buf)); }else
@@ -390,7 +390,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieeif (net_ratelimit ()) {printk (KERN_DEBUG "%s: STA %pM TX " "buffer full - dropping oldest frame\n" , - tx->dev->name, sta->sta.addr); + tx->sdata->name, sta->sta.addr); }#endif dev_kfree_skb (old);
@@ -415,7 +415,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG else if (unlikely(staflags & WLAN_STA_PS_STA)) {printk (KERN_DEBUG "%s: STA %pM in PS mode, but pspoll " -"set -> send frame\n" , tx->dev->name, +"set -> send frame\n" , tx->sdata->name, sta->sta.addr); }#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
@@ -548,7 +548,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021"%s: Dropped data frame as no usable bitrate found while " "scanning and associated. Target station: " "%pM on %d GHz band\n" , - tx->dev->name, hdr->addr1, + tx->sdata->name, hdr->addr1, tx->channel->band ? 5 : 2)) return TX_DROP;
@@ -1020,7 +1020,6 @@ ieee80211_tx_prepare(struct ieee80211_sumemset (tx,0 ,sizeof (*tx)); tx->skb = skb; - tx->dev = sdata->dev;/* use original interface */ tx->local = local; tx->sdata = sdata; tx->channel = local->hw.conf.channel;
@@ -1473,7 +1472,7 @@ static void ieee80211_xmit(struct ieee80continue ;if (tmp_sdata->vif.type !=NL80211_IFTYPE_AP )continue ; -if (compare_ether_addr (tmp_sdata->dev->dev_addr, +if (compare_ether_addr (tmp_sdata->vif.addr, hdr->addr2) ==0 ) { sdata = tmp_sdata;break ;
@@ -1637,7 +1636,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s fc |=cpu_to_le16 (IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS );/* RA TA DA SA */ memcpy (hdr.addr1, sta->sta.addr,ETH_ALEN ); -memcpy (hdr.addr2, dev->dev_addr,ETH_ALEN ); +memcpy (hdr.addr2, sdata->vif.addr,ETH_ALEN );memcpy (hdr.addr3, skb->data,ETH_ALEN );memcpy (hdr.addr4, skb->data +ETH_ALEN ,ETH_ALEN ); hdrlen =30 ;
@@ -1651,7 +1650,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s fc |=cpu_to_le16 (IEEE80211_FCTL_FROMDS );/* DA BSSID SA */ memcpy (hdr.addr1, skb->data,ETH_ALEN ); -memcpy (hdr.addr2, dev->dev_addr,ETH_ALEN ); +memcpy (hdr.addr2, sdata->vif.addr,ETH_ALEN );memcpy (hdr.addr3, skb->data +ETH_ALEN ,ETH_ALEN ); hdrlen =24 ;break ;
@@ -1659,7 +1658,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s fc |=cpu_to_le16 (IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS );/* RA TA DA SA */ memcpy (hdr.addr1, sdata->u.wds.remote_addr,ETH_ALEN ); -memcpy (hdr.addr2, dev->dev_addr,ETH_ALEN ); +memcpy (hdr.addr2, sdata->vif.addr,ETH_ALEN );memcpy (hdr.addr3, skb->data,ETH_ALEN );memcpy (hdr.addr4, skb->data +ETH_ALEN ,ETH_ALEN ); hdrlen =30 ;
@@ -1673,8 +1672,8 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail; } -if (compare_ether_addr (dev->dev_addr, - skb->data +ETH_ALEN ) ==0 ) { +if (compare_ether_addr (sdata->vif.addr, + skb->data +ETH_ALEN ) ==0 ) { hdrlen =ieee80211_fill_mesh_addresses (&hdr, &fc, skb->data, skb->data +ETH_ALEN ); meshhdrlen = ieee80211_new_mesh_header(&mesh_hdr,
@@ -1704,7 +1703,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s } } hdrlen =ieee80211_fill_mesh_addresses (&hdr, &fc, - mesh_da, dev->dev_addr); + mesh_da, sdata->vif.addr);rcu_read_unlock ();if (is_mesh_mcast) meshhdrlen =
@@ -1729,7 +1728,7 @@ netdev_tx_t ieee80211_subif_start_xmit(sif (sdata->u.mgd.use_4addr && ethertype !=ETH_P_PAE ) { fc |=cpu_to_le16 (IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS );/* RA TA DA SA */ -memcpy (hdr.addr2, dev->dev_addr,ETH_ALEN ); +memcpy (hdr.addr2, sdata->vif.addr,ETH_ALEN );memcpy (hdr.addr3, skb->data,ETH_ALEN );memcpy (hdr.addr4, skb->data +ETH_ALEN ,ETH_ALEN ); hdrlen =30 ;
@@ -1780,7 +1779,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s unlikely(!is_multicast_ether_addr(hdr.addr1) && !(sta_flags & WLAN_STA_AUTHORIZED) && !(ethertype == ETH_P_PAE && - compare_ether_addr(dev->dev_addr, + compare_ether_addr(sdata->vif.addr, skb->data + ETH_ALEN) == 0))) {#ifdef CONFIG_MAC80211_VERBOSE_DEBUG if (net_ratelimit ())
@@ -2144,8 +2143,8 @@ struct sk_buff *ieee80211_beacon_get_tim mgmt->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_BEACON );memset (mgmt->da,0xff ,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); -memcpy (mgmt->bssid, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN ); +memcpy (mgmt->bssid, sdata->vif.addr,ETH_ALEN ); mgmt->u.beacon.beacon_int =cpu_to_le16 (sdata->vif.bss_conf.beacon_int); mgmt->u.beacon.capab_info =0x0 ;/* 0x0 for MPs */
net/mac80211/util.c +7 -7
@@ -469,7 +469,7 @@ void ieee80211_iterate_active_interfacesbreak ; }if (netif_running (sdata->dev)) -iterator (data, sdata->dev->dev_addr, +iterator (data, sdata->vif.addr, &sdata->vif); }
@@ -503,7 +503,7 @@ void ieee80211_iterate_active_interfacesbreak ; }if (netif_running (sdata->dev)) -iterator (data, sdata->dev->dev_addr, +iterator (data, sdata->vif.addr, &sdata->vif); }
@@ -848,7 +848,7 @@ void ieee80211_send_auth(struct ieee8021 sizeof(*mgmt) + 6 + extra_len);if (!skb) {printk (KERN_DEBUG "%s: failed to allocate buffer for auth " -"frame\n" , sdata->dev->name); +"frame\n" , sdata->name);return ; }skb_reserve (skb, local->hw.extra_tx_headroom);
@@ -858,7 +858,7 @@ void ieee80211_send_auth(struct ieee8021 mgmt->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_AUTH );memcpy (mgmt->da, bssid,ETH_ALEN ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );memcpy (mgmt->bssid, bssid,ETH_ALEN ); mgmt->u.auth.auth_alg =cpu_to_le16 (auth_alg); mgmt->u.auth.auth_transaction =cpu_to_le16 (transaction);
@@ -949,7 +949,7 @@ void ieee80211_send_probe_req(struct iee ie_len);if (!skb) {printk (KERN_DEBUG "%s: failed to allocate buffer for probe " -"request\n" , sdata->dev->name); +"request\n" , sdata->name);return ; }skb_reserve (skb, local->hw.extra_tx_headroom);
@@ -958,7 +958,7 @@ void ieee80211_send_probe_req(struct ieememset (mgmt,0 ,24 ); mgmt->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_PROBE_REQ ); -memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN ); +memcpy (mgmt->sa, sdata->vif.addr,ETH_ALEN );if (dst) {memcpy (mgmt->da, dst,ETH_ALEN );memcpy (mgmt->bssid, dst,ETH_ALEN );
@@ -1051,7 +1051,7 @@ int ieee80211_reconfig(struct ieee80211_ netif_running(sdata->dev)) { conf.vif = &sdata->vif; conf.type = sdata->vif.type; - conf.mac_addr = sdata->dev->dev_addr; + conf.mac_addr = sdata->vif.addr; res =drv_add_interface (local, &conf); } }
include/net/mac80211.h +2 -0
@@ -659,12 +659,14 @@ struct ieee80211_conf {* @type: type of this virtual interface * @bss_conf: BSS configuration for this interface, either our own * or the BSS we're associated to +* @addr: address of this interface * @drv_priv: data area for driver use, will always be aligned to * sizeof(void *). */ struct ieee80211_vif {enum nl80211_iftype type;struct ieee80211_bss_conf bss_conf; +u8 addr[ETH_ALEN ];/* must be last */ u8 drv_priv[0 ] __attribute__((__aligned__ (sizeof (void *)))); };
net/mac80211/driver-ops.h +2 -2
@@ -39,7 +39,7 @@ static inline int drv_add_interface(stru struct ieee80211_if_init_conf *conf) {int ret = local->ops->add_interface (&local->hw, conf); -trace_drv_add_interface (local, conf->mac_addr, conf->vif, ret); +trace_drv_add_interface (local, conf->vif, ret);return ret; }
@@ -47,7 +47,7 @@ static inline void drv_remove_interface( struct ieee80211_if_init_conf *conf) { local->ops->remove_interface (&local->hw, conf); -trace_drv_remove_interface (local, conf->mac_addr, conf->vif); +trace_drv_remove_interface (local, conf->vif); }static inline int drv_config (struct ieee80211_local *local,u32 changed)
net/mac80211/driver-trace.h +5 -7
@@ -70,11 +70,10 @@ TRACE_EVENT(drv_stop, TRACE_EVENT(drv_add_interface, TP_PROTO(struct ieee80211_local *local, - const u8 *addr, struct ieee80211_vif *vif, int ret), - TP_ARGS(local, addr, vif, ret), + TP_ARGS(local, vif, ret), TP_STRUCT__entry( LOCAL_ENTRY
@@ -86,7 +85,7 @@ TRACE_EVENT(drv_add_interface,TP_fast_assign ( LOCAL_ASSIGN;VIF_ASSIGN ; -memcpy (__entry->addr, addr,6 ); +memcpy (__entry->addr, vif->addr,6 ); __entry->ret = ret; ),
@@ -97,10 +96,9 @@ TRACE_EVENT(drv_add_interface, ); TRACE_EVENT(drv_remove_interface, - TP_PROTO(struct ieee80211_local *local, - const u8 *addr, struct ieee80211_vif *vif), + TP_PROTO(struct ieee80211_local *local, struct ieee80211_vif *vif), - TP_ARGS(local, addr, vif), + TP_ARGS(local, vif), TP_STRUCT__entry( LOCAL_ENTRY
@@ -111,7 +109,7 @@ TRACE_EVENT(drv_remove_interface,TP_fast_assign ( LOCAL_ASSIGN;VIF_ASSIGN ; -memcpy (__entry->addr, addr,6 ); +memcpy (__entry->addr, vif->addr,6 ); ), TP_printk(
net/mac80211/iface.c +59 -3
95 lines not on this page · raw message
net/mac80211/debugfs_netdev.c +5 -50
79 lines not on this page · raw message
net/mac80211/debugfs_netdev.h +3 -6
@@ -6,8 +6,7 @@#ifdef CONFIG_MAC80211_DEBUGFS void ieee80211_debugfs_add_netdev (struct ieee80211_sub_if_data *sdata);void ieee80211_debugfs_remove_netdev (struct ieee80211_sub_if_data *sdata); -void ieee80211_debugfs_netdev_init (void ); -void ieee80211_debugfs_netdev_exit (void ); +void ieee80211_debugfs_rename_netdev (struct ieee80211_sub_if_data *sdata);#else static inline void ieee80211_debugfs_add_netdev (struct ieee80211_sub_if_data *sdata)
@@ -15,10 +14,8 @@ static inline void ieee80211_debugfs_addstatic inline void ieee80211_debugfs_remove_netdev (struct ieee80211_sub_if_data *sdata) {} -static inline void ieee80211_debugfs_netdev_init (void ) -{} - -static inline void ieee80211_debugfs_netdev_exit (void ) +static inline void ieee80211_debugfs_rename_netdev ( +struct ieee80211_sub_if_data *sdata) {}#endif
net/mac80211/ieee80211_i.h +4 -1
@@ -140,7 +140,6 @@ typedef unsigned __bitwise__ ieee80211_tstruct ieee80211_tx_data {struct sk_buff *skb; -struct net_device *dev;struct ieee80211_local *local;struct ieee80211_sub_if_data *sdata;struct sta_info *sta;
@@ -433,6 +432,8 @@ struct ieee80211_sub_if_data {int drop_unencrypted; +char name[IFNAMSIZ ]; +/* * keep track of whether the HT opmode (stored in * vif.bss_info.ht_operation_mode) is valid.
@@ -937,6 +938,8 @@ void ieee80211_rx_bss_put(struct ieee802 struct ieee80211_bss *bss);/* interface handling */ +int ieee80211_iface_init (void ); +void ieee80211_iface_exit (void );int ieee80211_if_add (struct ieee80211_local *local,const char *name,struct net_device **new_dev,enum nl80211_iftype type,struct vif_params *params);
net/mac80211/debugfs_sta.c +1 -1
@@ -44,7 +44,7 @@ static const struct file_operations sta_STA_OPS (name) STA_FILE(aid, sta.aid, D); -STA_FILE (dev, sdata->dev->name,S ); +STA_FILE (dev, sdata->name,S );STA_FILE (rx_packets, rx_packets,LU );STA_FILE (tx_packets, tx_packets,LU );STA_FILE (rx_bytes, rx_bytes,LU );
net/mac80211/debugfs_key.c +1 -1
@@ -56,7 +56,7 @@ KEY_CONF_FILE(keyidx, D);KEY_CONF_FILE (hw_key_idx,D );KEY_FILE (flags,X );KEY_FILE (tx_rx_count,D ); -KEY_READ (ifindex, sdata->dev->ifindex,20 ,"%d\n" ); +KEY_READ (ifindex, sdata->name,IFNAMSIZ +2 ,"%s\n" );KEY_OPS (ifindex); static ssize_t key_algorithm_read(struct file *file,
net/mac80211/cfg.c +1 -1
@@ -729,7 +729,7 @@ static int ieee80211_add_station(struct }else sdata =IEEE80211_DEV_TO_SUB_IF (dev); -if (compare_ether_addr (mac, dev->dev_addr) ==0 ) +if (compare_ether_addr (mac, sdata->vif.addr) ==0 )return -EINVAL ;if (is_multicast_ether_addr (mac))
net/mac80211/pm.c +1 -1
@@ -102,7 +102,7 @@ int __ieee80211_suspend(struct ieee80211 conf.vif = &sdata->vif; conf.type = sdata->vif.type; - conf.mac_addr = sdata->dev->dev_addr; + conf.mac_addr = sdata->vif.addr;drv_remove_interface (local, &conf); }