mac80211: mlme work improvements
Subsystems (2)
Johannes Berg
maintainercover mac80211: mlme work improvements
This patch series fixes some things and then
generalises the mlme work to be more usable
for things like Jouni's off-channel stuff and
also BT3 eventually.
johannes
Johannes Berg
maintainerPATCH 1/6 cfg80211: avoid sending spurious deauth to userspace
Before
commit ca9034592823e8179511e48a78731f95bfdd766c
Author: Holger Schurig <[email protected]>
Date: Tue Oct 13 13:45:28 2009 +0200
cfg80211: remove warning in deauth case
we assumed that drivers never give us spurious deauth frames because they filter them out based on the auth state they keep track of. This turned out to be racy, because userspace might deauth while the AP is also sending a deauth frame, so the warning was removed.
However, in that case we should not tell userspace about the AP's frame if it requested deauth "first", where "first" means it came to cfg80211 first.
--- net/wireless/mlme.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/wireless/mlme.c +9 -2
@@ -137,22 +137,23 @@ void __cfg80211_send_deauth(struct net_dstruct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;const u8 *bssid = mgmt->bssid;int i; +bool found = false;ASSERT_WDEV_LOCK (wdev); -nl80211_send_deauth (rdev, dev, buf, len,GFP_KERNEL ); -if (wdev->current_bss &&memcmp (wdev->current_bss->pub.bssid, bssid,ETH_ALEN ) ==0 ) {cfg80211_unhold_bss (wdev->current_bss);cfg80211_put_bss (&wdev->current_bss->pub); wdev->current_bss =NULL ; + found = true; }else for (i =0 ; i <MAX_AUTH_BSSES ; i++) {if (wdev->auth_bsses[i] &&memcmp (wdev->auth_bsses[i]->pub.bssid, bssid,ETH_ALEN ) ==0 ) {cfg80211_unhold_bss (wdev->auth_bsses[i]);cfg80211_put_bss (&wdev->auth_bsses[i]->pub); wdev->auth_bsses[i] =NULL ; + found = true;break ; } if (wdev->authtry_bsses[i] &&
@@ -160,10 +161,16 @@ void __cfg80211_send_deauth(struct net_dcfg80211_unhold_bss (wdev->authtry_bsses[i]);cfg80211_put_bss (&wdev->authtry_bsses[i]->pub); wdev->authtry_bsses[i] =NULL ; + found = true;break ; } } +if (!found) +return ; + +nl80211_send_deauth (rdev, dev, buf, len,GFP_KERNEL ); +if (wdev->sme_state ==CFG80211_SME_CONNECTED ) {u16 reason_code;bool from_ap;
Johannes Berg
maintainerPATCH 2/6 mac80211: dont try to use existing sta for AP
In reply to Johannes BergClean out some cruft that could use an already existing sta_info struct -- that case cannot happen. Also, there's a bug there -- if allocation/insertion fails then it is possible that we are left in a lingering state where mac80211 waits for the AP, cfg80211 waits for mac80211, but the AP has already replied. Since there's no way to indicate an internal error, pretend there was a timeout, i.e. that the AP never responded.
--- net/mac80211/mlme.c | 57 +++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 33 deletions(-)
net/mac80211/mlme.c +24 -33
@@ -75,6 +75,9 @@ enum rx_mgmt_action {/* caller must call cfg80211_send_disassoc() */ RX_MGMT_CFG80211_DISASSOC , +/* caller must tell cfg80211 about internal error */ +RX_MGMT_CFG80211_ASSOC_ERROR , +/* caller must call cfg80211_auth_timeout() & free work */ RX_MGMT_CFG80211_AUTH_TO,
@@ -1479,8 +1482,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeestruct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;u8 *pos;u32 changed =0 ; -int i, j; -bool have_higher_than_11mbit = false, newsta = false; +int i, j, err; +bool have_higher_than_11mbit = false;u16 ap_ht_cap_flags;/*
@@ -1542,30 +1545,18 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeeprintk (KERN_DEBUG "%s: associated\n" , sdata->name); ifmgd->aid = aid; -rcu_read_lock (); - -/* Add STA entry for the AP */ - sta =sta_info_get (sdata, wk->bss->cbss.bssid); + sta =sta_info_alloc (sdata, wk->bss->cbss.bssid,GFP_KERNEL );if (!sta) { - newsta = true; - -rcu_read_unlock (); - - sta =sta_info_alloc (sdata, wk->bss->cbss.bssid,GFP_KERNEL ); -if (!sta) { -printk (KERN_DEBUG "%s: failed to alloc STA entry for" -" the AP\n" , sdata->name); -return RX_MGMT_NONE ; - } - -set_sta_flags (sta,WLAN_STA_AUTH |WLAN_STA_ASSOC | -WLAN_STA_ASSOC_AP ); -if (!(ifmgd->flags &IEEE80211_STA_CONTROL_PORT )) -set_sta_flags (sta,WLAN_STA_AUTHORIZED ); - -rcu_read_lock (); +printk (KERN_DEBUG "%s: failed to alloc STA entry for" +" the AP\n" , sdata->name); +return RX_MGMT_CFG80211_ASSOC_ERROR ; } +set_sta_flags (sta,WLAN_STA_AUTH |WLAN_STA_ASSOC | +WLAN_STA_ASSOC_AP ); +if (!(ifmgd->flags &IEEE80211_STA_CONTROL_PORT )) +set_sta_flags (sta,WLAN_STA_AUTHORIZED ); + rates =0 ; basic_rates =0 ; sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
@@ -1628,18 +1619,14 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeeif (elems.wmm_param)set_sta_flags (sta,WLAN_STA_WME ); -if (newsta) { -int err =sta_info_insert (sta); -if (err) { -printk (KERN_DEBUG "%s: failed to insert STA entry for" -" the AP (error %d)\n" , sdata->name, err); -rcu_read_unlock (); -return RX_MGMT_NONE ; - } + err =sta_info_insert (sta); + sta =NULL ; +if (err) { +printk (KERN_DEBUG "%s: failed to insert STA entry for" +" the AP (error %d)\n" , sdata->name, err); +return RX_MGMT_CFG80211_ASSOC_ERROR ; } -rcu_read_unlock (); -if (elems.wmm_param)ieee80211_sta_wmm_params (local, ifmgd, elems.wmm_param, elems.wmm_param_len);
@@ -2084,6 +2071,10 @@ static void ieee80211_sta_rx_queued_mgmtcase RX_MGMT_CFG80211_DEAUTH :cfg80211_send_deauth (sdata->dev, (u8 *)mgmt, skb->len);break ; +case RX_MGMT_CFG80211_ASSOC_ERROR : +/* an internal error -- pretend timeout for now */ +cfg80211_send_assoc_timeout (sdata->dev, mgmt->bssid); +break ;default :WARN (1 ,"unexpected: %d" , rma); }
Johannes Berg
maintainerPATCH 3/6 mac80211: let cfg80211 manage auth state
In reply to Johannes Bergmac80211 currently hangs on to the auth state by keeping it on the work list. That can lead to confusing behaviour like rejecting scans while authenticated to any AP (but not yet associated.) It also means that it needs to keep track of the work struct while associated for when it gets disassociated (or disassociates.)
Change this to free the work struct after the authentication completed successfully and allocate a new one for associating, thereby letting cfg80211 manage the auth state. Another change necessary for this is to tell cfg80211 about all unicast deauth frames sent to mac80211 since now it can no longer check the auth state, but that check was racy anyway.
--- net/mac80211/ieee80211_i.h | 3 net/mac80211/mlme.c | 173 ++++++++++++++++++--------------------------- 2 files changed, 73 insertions(+), 103 deletions(-)
net/mac80211/mlme.c +72 -101
@@ -949,11 +949,10 @@ static u32 ieee80211_handle_bss_capabili }static void ieee80211_set_associated (struct ieee80211_sub_if_data *sdata, -struct ieee80211_mgd_work *wk, +struct ieee80211_bss *bss,u32 bss_info_changed) {struct ieee80211_local *local = sdata->local; -struct ieee80211_bss *bss = wk->bss; bss_info_changed |=BSS_CHANGED_ASSOC ;/* set timing information */
@@ -966,7 +965,6 @@ static void ieee80211_set_associated(str bss->cbss.capability, bss->has_erp_value, bss->erp_value); sdata->u.mgd.associated = bss; - sdata->u.mgd.old_associate_work = wk;memcpy (sdata->u.mgd.bssid, bss->cbss.bssid,ETH_ALEN );/* just to be sure */
@@ -1082,8 +1080,7 @@ ieee80211_authenticate(struct ieee80211_return RX_MGMT_NONE ; } -static void ieee80211_set_disassoc (struct ieee80211_sub_if_data *sdata, -bool deauth) +static void ieee80211_set_disassoc (struct ieee80211_sub_if_data *sdata) {struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;struct ieee80211_local *local = sdata->local;
@@ -1101,16 +1098,6 @@ static void ieee80211_set_disassoc(struc ifmgd->associated =NULL ;memset (ifmgd->bssid,0 ,ETH_ALEN ); -if (deauth) { -kfree (ifmgd->old_associate_work); - ifmgd->old_associate_work =NULL ; - }else { -struct ieee80211_mgd_work *wk = ifmgd->old_associate_work; - - wk->state =IEEE80211_MGD_STATE_IDLE ; -list_add (&wk->list, &ifmgd->work_list); - } -/* * we need to commit the associated = NULL change because the * scan code uses that to determine whether this iface should
@@ -1325,7 +1312,8 @@ EXPORT_SYMBOL(ieee80211_beacon_loss);static void ieee80211_auth_completed (struct ieee80211_sub_if_data *sdata,struct ieee80211_mgd_work *wk) { - wk->state =IEEE80211_MGD_STATE_IDLE ; +list_del (&wk->list); +kfree (wk);printk (KERN_DEBUG "%s: authenticated\n" , sdata->name); }
@@ -1403,7 +1391,6 @@ ieee80211_rx_mgmt_auth(struct ieee80211_static enum rx_mgmt_action __must_check ieee80211_rx_mgmt_deauth (struct ieee80211_sub_if_data *sdata, -struct ieee80211_mgd_work *wk,struct ieee80211_mgmt *mgmt,size_t len) {struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -1415,23 +1402,15 @@ ieee80211_rx_mgmt_deauth(struct ieee8021ASSERT_MGD_MTX (ifmgd); -if (wk) - bssid = wk->bss->cbss.bssid; -else - bssid = ifmgd->associated->cbss.bssid; + bssid = ifmgd->associated->cbss.bssid; reason_code =le16_to_cpu (mgmt->u.deauth.reason_code);printk (KERN_DEBUG "%s: deauthenticated from %pM (Reason: %u)\n" , sdata->name, bssid, reason_code); -if (!wk) { -ieee80211_set_disassoc (sdata, true); -ieee80211_recalc_idle (sdata->local); - }else { -list_del (&wk->list); -kfree (wk); - } +ieee80211_set_disassoc (sdata); +ieee80211_recalc_idle (sdata->local);return RX_MGMT_CFG80211_DEAUTH ; }
@@ -1460,7 +1439,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80printk (KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n" , sdata->name, mgmt->sa, reason_code); -ieee80211_set_disassoc (sdata, false); +ieee80211_set_disassoc (sdata);ieee80211_recalc_idle (sdata->local);return RX_MGMT_CFG80211_DISASSOC ; }
@@ -1476,6 +1455,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeestruct ieee80211_local *local = sdata->local;struct ieee80211_supported_band *sband;struct sta_info *sta; +struct ieee80211_bss *bss = wk->bss;u32 rates, basic_rates;u16 capab_info, status_code, aid;struct ieee802_11_elems elems;
@@ -1494,7 +1474,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeeif (len <24 +6 )return RX_MGMT_NONE ; -if (memcmp (wk->bss->cbss.bssid, mgmt->sa,ETH_ALEN ) !=0 ) +if (memcmp (bss->cbss.bssid, mgmt->sa,ETH_ALEN ) !=0 )return RX_MGMT_NONE ; capab_info =le16_to_cpu (mgmt->u.assoc_resp.capab_info);
@@ -1524,10 +1504,17 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeereturn RX_MGMT_NONE ; } +/* +* Here the association was either successful or not. +*/ + +/* delete work item -- must be before set_associated for PS */ +list_del (&wk->list); +kfree (wk); +if (status_code !=WLAN_STATUS_SUCCESS ) {printk (KERN_DEBUG "%s: AP denied association (code=%d)\n" , sdata->name, status_code); - wk->state =IEEE80211_MGD_STATE_IDLE ;return RX_MGMT_CFG80211_ASSOC ; }
@@ -1545,7 +1532,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeeprintk (KERN_DEBUG "%s: associated\n" , sdata->name); ifmgd->aid = aid; - sta =sta_info_alloc (sdata, wk->bss->cbss.bssid,GFP_KERNEL ); + sta =sta_info_alloc (sdata, bss->cbss.bssid,GFP_KERNEL );if (!sta) {printk (KERN_DEBUG "%s: failed to alloc STA entry for" " the AP\n" , sdata->name);
@@ -1637,18 +1624,14 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee (ifmgd->flags & IEEE80211_STA_WMM_ENABLED) && !(ifmgd->flags & IEEE80211_STA_DISABLE_11N)) changed |=ieee80211_enable_ht (sdata, elems.ht_info_elem, - wk->bss->cbss.bssid, + bss->cbss.bssid, ap_ht_cap_flags); -/* delete work item -- must be before set_associated for PS */ -list_del (&wk->list); -/* set AID and assoc capability, * ieee80211_set_associated() will tell the driver */ bss_conf->aid = aid; bss_conf->assoc_capability = capab_info; -/* this will take ownership of wk */ -ieee80211_set_associated (sdata, wk, changed); +ieee80211_set_associated (sdata, bss, changed);/* * Start timer to probe the connection to the AP now.
@@ -1991,8 +1974,7 @@ static void ieee80211_sta_rx_queued_mgmt skb->len, rx_status);break ;case IEEE80211_STYPE_DEAUTH : - rma =ieee80211_rx_mgmt_deauth (sdata,NULL , - mgmt, skb->len); + rma =ieee80211_rx_mgmt_deauth (sdata, mgmt, skb->len);break ;case IEEE80211_STYPE_DISASSOC : rma =ieee80211_rx_mgmt_disassoc (sdata, mgmt, skb->len);
@@ -2043,8 +2025,15 @@ static void ieee80211_sta_rx_queued_mgmt skb->len, true);break ;case IEEE80211_STYPE_DEAUTH : - rma =ieee80211_rx_mgmt_deauth (sdata, wk, mgmt, - skb->len); +if (skb->len >=24 +2 /* mgmt + deauth reason */ ) { +/* +* We get here if we get deauth while +* trying to auth/assoc. Telling cfg80211 +* is handled below, unconditionally. +*/ +list_del (&wk->list); +kfree (wk); + }break ; }/*
@@ -2058,6 +2047,12 @@ static void ieee80211_sta_rx_queued_mgmtmutex_unlock (&ifmgd->mtx); +if (skb->len >=24 +2 /* mgmt + deauth reason */ && + (fc &IEEE80211_FCTL_STYPE ) ==IEEE80211_STYPE_DEAUTH ) { +WARN_ON (rma !=RX_MGMT_NONE ); + rma =RX_MGMT_CFG80211_DEAUTH ; + } +switch (rma) {case RX_MGMT_NONE :/* no action */
@@ -2108,7 +2103,6 @@ static void ieee80211_sta_work(struct wostruct ieee80211_mgd_work *wk, *tmp;LIST_HEAD (free_work);enum rx_mgmt_action rma; -bool anybusy = false;if (!ieee80211_sdata_running (sdata))return ;
@@ -2163,7 +2157,7 @@ static void ieee80211_sta_work(struct woprintk (KERN_DEBUG "No probe response from AP %pM" " after %dms, disconnecting.\n" , bssid, (1000 *IEEE80211_PROBE_WAIT )/HZ ); -ieee80211_set_disassoc (sdata, true); +ieee80211_set_disassoc (sdata);ieee80211_recalc_idle (local);mutex_unlock (&ifmgd->mtx);/*
@@ -2195,8 +2189,6 @@ static void ieee80211_sta_work(struct woswitch (wk->state) {default :WARN_ON (1 ); -/* fall through */ -case IEEE80211_MGD_STATE_IDLE :/* nothing */ rma =RX_MGMT_NONE ;break ;
@@ -2219,20 +2211,19 @@ static void ieee80211_sta_work(struct wocase RX_MGMT_CFG80211_ASSOC_TO :list_del (&wk->list);list_add (&wk->list, &free_work); - wk->tries = rma;/* small abuse but only local */ +/* +* small abuse but only local -- keep the +* action type in wk->timeout while the item +* is on the cleanup list +*/ + wk->timeout = rma;break ;default :WARN (1 ,"unexpected: %d" , rma); } } -list_for_each_entry (wk, &ifmgd->work_list, list) { -if (wk->state !=IEEE80211_MGD_STATE_IDLE ) { - anybusy = true; -break ; - } - } -if (!anybusy && +if (list_empty (&ifmgd->work_list) &&test_and_clear_bit (IEEE80211_STA_REQ_SCAN , &ifmgd->request)) ieee80211_queue_delayed_work(&local->hw, &local->scan_work,
@@ -2241,7 +2232,8 @@ static void ieee80211_sta_work(struct womutex_unlock (&ifmgd->mtx);list_for_each_entry_safe (wk, tmp, &free_work, list) { -switch (wk->tries) { +/* see above how we're using wk->timeout */ +switch (wk->timeout) {case RX_MGMT_CFG80211_AUTH_TO :cfg80211_send_auth_timeout (sdata->dev, wk->bss->cbss.bssid);
@@ -2251,7 +2243,7 @@ static void ieee80211_sta_work(struct wo wk->bss->cbss.bssid);break ;default : -WARN (1 ,"unexpected: %d" , wk->tries); +WARN (1 ,"unexpected: %lu" , wk->timeout); }list_del (&wk->list);
@@ -2479,35 +2471,18 @@ int ieee80211_mgd_assoc(struct ieee80211 struct cfg80211_assoc_request *req) {struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; -struct ieee80211_mgd_work *wk, *found =NULL ; +struct ieee80211_mgd_work *wk; +const u8 *ssid;int i, err;mutex_lock (&ifmgd->mtx); -list_for_each_entry (wk, &ifmgd->work_list, list) { -if (&wk->bss->cbss == req->bss && - wk->state ==IEEE80211_MGD_STATE_IDLE ) { - found = wk; -break ; - } - } - -if (!found) { - err = -ENOLINK ; - goto out; - } - -list_del (&found->list); - - wk =krealloc (found,sizeof (*wk) + req->ie_len,GFP_KERNEL ); + wk =kzalloc (sizeof (*wk) + req->ie_len,GFP_KERNEL );if (!wk) { -list_add (&found->list, &ifmgd->work_list); err = -ENOMEM ; goto out; } -list_add (&wk->list, &ifmgd->work_list); - ifmgd->flags &= ~IEEE80211_STA_DISABLE_11N ;for (i =0 ; i < req->crypto.n_ciphers_pairwise; i++)
@@ -2516,8 +2491,6 @@ int ieee80211_mgd_assoc(struct ieee80211 req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104) ifmgd->flags |= IEEE80211_STA_DISABLE_11N; - sdata->local->oper_channel = req->bss->channel; -ieee80211_hw_config (sdata->local,0 );if (req->ie && req->ie_len) {memcpy (wk->ie, req->ie, req->ie_len);
@@ -2525,11 +2498,16 @@ int ieee80211_mgd_assoc(struct ieee80211 }else wk->ie_len =0 ; + wk->bss = (void *)req->bss; + + ssid =ieee80211_bss_get_ie (req->bss,WLAN_EID_SSID ); +memcpy (wk->ssid, ssid +2 , ssid[1 ]); + wk->ssid_len = ssid[1 ]; +if (req->prev_bssid)memcpy (wk->prev_bssid, req->prev_bssid,ETH_ALEN ); wk->state =IEEE80211_MGD_STATE_ASSOC ; - wk->tries =0 ; wk->timeout = jiffies;/* run right away */ if (req->use_mfp) {
@@ -2545,6 +2523,10 @@ int ieee80211_mgd_assoc(struct ieee80211else ifmgd->flags &= ~IEEE80211_STA_CONTROL_PORT ; + sdata->local->oper_channel = req->bss->channel; +ieee80211_hw_config (sdata->local,0 ); + +list_add (&wk->list, &ifmgd->work_list);ieee80211_queue_work (&sdata->local->hw, &sdata->u.mgd.work); err =0 ;
@@ -2560,23 +2542,23 @@ int ieee80211_mgd_deauth(struct ieee8021 {struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;struct ieee80211_mgd_work *wk; -const u8 *bssid =NULL ; +const u8 *bssid = req->bss->bssid;bool not_auth_yet = false;mutex_lock (&ifmgd->mtx);if (ifmgd->associated && &ifmgd->associated->cbss == req->bss) { bssid = req->bss->bssid; -ieee80211_set_disassoc (sdata, true); +ieee80211_set_disassoc (sdata); } else list_for_each_entry(wk, &ifmgd->work_list, list) { -if (&wk->bss->cbss == req->bss) { - bssid = req->bss->bssid; -if (wk->state ==IEEE80211_MGD_STATE_PROBE ) - not_auth_yet = true; -list_del (&wk->list); -kfree (wk); -break ; - } +if (wk->state !=IEEE80211_MGD_STATE_PROBE ) +continue ; +if (req->bss != &wk->bss->cbss) +continue ; + not_auth_yet = true; +list_del (&wk->list); +kfree (wk); +break ; }/*
@@ -2593,17 +2575,6 @@ int ieee80211_mgd_deauth(struct ieee8021return 0 ; } -/* -* cfg80211 should catch this ... but it's racy since -* we can receive a deauth frame, process it, hand it -* to cfg80211 while that's in a locked section already -* trying to tell us that the user wants to disconnect. -*/ -if (!bssid) { -mutex_unlock (&ifmgd->mtx); -return -ENOLINK ; - } -mutex_unlock (&ifmgd->mtx); printk(KERN_DEBUG "%s: deauthenticating from %pM by local choice (reason=%d)\n",
@@ -2640,7 +2611,7 @@ int ieee80211_mgd_disassoc(struct ieee80printk (KERN_DEBUG "%s: disassociating from %pM by local choice (reason=%d)\n" , sdata->name, req->bss->bssid, req->reason_code); -ieee80211_set_disassoc (sdata, false); +ieee80211_set_disassoc (sdata);mutex_unlock (&ifmgd->mtx);
net/mac80211/ieee80211_i.h +1 -2
@@ -228,7 +228,7 @@ struct mesh_preq_queue { };enum ieee80211_mgd_state { -IEEE80211_MGD_STATE_IDLE , +IEEE80211_MGD_STATE_INVALID ,IEEE80211_MGD_STATE_PROBE ,IEEE80211_MGD_STATE_AUTH ,IEEE80211_MGD_STATE_ASSOC ,
@@ -285,7 +285,6 @@ struct ieee80211_if_managed {struct mutex mtx;struct ieee80211_bss *associated; -struct ieee80211_mgd_work *old_associate_work;struct list_head work_list;u8 bssid[ETH_ALEN ];
Johannes Berg
maintainerPATCH 4/6 mac80211: generalise management work a bit
In reply to Johannes BergAs a first step of generalising management work, this renames a few things and puts more information directly into the struct so that auth/assoc need not access the BSS pointer as often -- in fact it can be removed from auth completely. Also since the previous patch made sure a new work item is used for association, we can make the different data a union.
--- net/mac80211/ieee80211_i.h | 53 ++++++---- net/mac80211/mlme.c | 226 +++++++++++++++++++++++++++------------------ 2 files changed, 172 insertions(+), 107 deletions(-)
net/mac80211/ieee80211_i.h +35 -18
@@ -227,31 +227,48 @@ struct mesh_preq_queue {u8 flags; }; -enum ieee80211_mgd_state { -IEEE80211_MGD_STATE_INVALID , -IEEE80211_MGD_STATE_PROBE , -IEEE80211_MGD_STATE_AUTH , -IEEE80211_MGD_STATE_ASSOC , +enum ieee80211_work_type { +IEEE80211_WORK_AUTH_PROBE , +IEEE80211_WORK_AUTH , +IEEE80211_WORK_ASSOC , }; -struct ieee80211_mgd_work { +struct ieee80211_work {struct list_head list; -struct ieee80211_bss *bss; -int ie_len; -u8 prev_bssid[ETH_ALEN ]; -u8 ssid[IEEE80211_MAX_SSID_LEN ]; -u8 ssid_len; -unsigned long timeout; -enum ieee80211_mgd_state state; -u16 auth_alg, auth_transaction; -int tries; +struct ieee80211_channel *chan; +/* XXX: chan type? -- right now not really needed */ +unsigned long timeout; +enum ieee80211_work_type type; -u8 key[WLAN_KEY_LEN_WEP104 ]; -u8 key_len, key_idx; +union { +struct { +int tries; +u16 algorithm, transaction; +u8 ssid[IEEE80211_MAX_SSID_LEN ]; +u8 ssid_len; +u8 bssid[ETH_ALEN ]; +u8 key[WLAN_KEY_LEN_WEP104 ]; +u8 key_len, key_idx; +bool privacy; + } auth; +struct { +struct ieee80211_bss *bss; +const u8 *supp_rates; +const u8 *ht_information_ie; +int tries; +u16 capability; +u8 bssid[ETH_ALEN ], prev_bssid[ETH_ALEN ]; +u8 ssid[IEEE80211_MAX_SSID_LEN ]; +u8 ssid_len; +u8 supp_rates_len; +bool wmm_used; + } assoc; + }; +int ie_len;/* must be last */ -u8 ie[0 ];/* for auth or assoc frame, not probe */ +u8 ie[0 ]; };/* flags used in struct ieee80211_if_managed.flags */
net/mac80211/mlme.c +137 -89
543 lines not on this page · raw message
Johannes Berg
maintainerPATCH 5/6 mac80211: generalise work handling
In reply to Johannes BergIn order to use auth/assoc for different purposes other than MLME, it needs to be split up. For other purposes, a generic work handling (potentially on another channel) will be useful.
To achieve that, this patch moves much of the MLME work handling out of mlme into a new work API. The API can currently handle probing a specific AP, authentication and association. The MLME previously handled probe/authentication as one step and will continue to do so, but they are separate in the new work handling.
Work items are RCU-managed to be able to check for existence of an item for a specific frame in the RX path, but they can be re-used which the MLME right now will do for its combined probe/auth step.
--- net/mac80211/Makefile | 2 net/mac80211/debugfs_netdev.c | 2 net/mac80211/ieee80211_i.h | 58 +- net/mac80211/iface.c | 11 net/mac80211/main.c | 2 net/mac80211/mlme.c | 924 +++++------------------------------------- net/mac80211/rx.c | 5 net/mac80211/scan.c | 8 net/mac80211/work.c | 902 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1094 insertions(+), 820 deletions(-)
net/mac80211/Makefile +1 -1
@@ -9,7 +9,7 @@ mac80211-y := \ scan.o \ ht.o agg-tx.o agg-rx.o \ ibss.o \ - mlme.o \ + mlme.o work.o \ iface.o \ rate.o \ michael.o \
net/mac80211/ieee80211_i.h +43 -15
133 lines not on this page · raw message
net/mac80211/iface.c +9 -2
@@ -362,6 +362,11 @@ static int ieee80211_stop(struct net_devnetif_stop_queue (dev);/* +* Purge work for this interface. +*/ +ieee80211_work_purge (sdata); + +/* * Now delete all active aggregation sessions. */ rcu_read_lock ();
@@ -937,6 +942,9 @@ u32 __ieee80211_recalc_idle(struct ieee8struct ieee80211_sub_if_data *sdata;int count =0 ; +if (!list_empty (&local->work_list)) +return ieee80211_idle_off (local,"working" ); +if (local->scanning)return ieee80211_idle_off (local,"scanning" );
@@ -945,8 +953,7 @@ u32 __ieee80211_recalc_idle(struct ieee8continue ;/* do not count disabled managed interfaces */ if (sdata->vif.type ==NL80211_IFTYPE_STATION && - !sdata->u.mgd.associated && -list_empty (&sdata->u.mgd.work_list)) + !sdata->u.mgd.associated)continue ;/* do not count unused IBSS interfaces */ if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
net/mac80211/mlme.c +130 -794
1,169 lines not on this page · raw message
net/mac80211/scan.c +2 -6
@@ -422,7 +422,6 @@ static int __ieee80211_start_scan(struct struct cfg80211_scan_request *req) {struct ieee80211_local *local = sdata->local; -struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;int rc;if (local->scan_req)
@@ -452,11 +451,8 @@ static int __ieee80211_start_scan(struct local->scan_req = req; local->scan_sdata = sdata; -if (req != local->int_scan_req && - sdata->vif.type ==NL80211_IFTYPE_STATION && - !list_empty (&ifmgd->work_list)) { -/* actually wait for the work it's doing to finish/time out */ -set_bit (IEEE80211_STA_REQ_SCAN , &ifmgd->request); +if (!list_empty (&local->work_list)) { +/* wait for the work to finish/time out */ return 0 ; }
net/mac80211/work.c new file +902 -0
902 lines not on this page · raw message
net/mac80211/debugfs_netdev.c +0 -2
@@ -133,7 +133,6 @@ IEEE80211_IF_FILE(max_ratectrl_rateidx,/* STA attributes */ IEEE80211_IF_FILE (bssid, u.mgd.bssid,MAC );IEEE80211_IF_FILE (aid, u.mgd.aid,DEC ); -IEEE80211_IF_FILE (capab, u.mgd.capab,HEX );static int ieee80211_set_smps (struct ieee80211_sub_if_data *sdata,enum ieee80211_smps_mode smps_mode)
@@ -270,7 +269,6 @@ static void add_sta_files(struct ieee802DEBUGFS_ADD (bssid, sta);DEBUGFS_ADD (aid, sta); -DEBUGFS_ADD (capab, sta);DEBUGFS_ADD_MODE (smps,0600 ); }
net/mac80211/main.c +2 -0
@@ -395,6 +395,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(INIT_DELAYED_WORK (&local->scan_work, ieee80211_scan_work); +ieee80211_work_init (local); +INIT_WORK (&local->restart_work, ieee80211_restart_work);INIT_WORK (&local->reconfig_filter, ieee80211_reconfig_filter);
net/mac80211/rx.c +5 -0
@@ -2025,6 +2025,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ {struct ieee80211_sub_if_data *sdata = rx->sdata;struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) rx->skb->data; +ieee80211_rx_result rxs;if (!(rx->flags &IEEE80211_RX_RA_MATCH ))return RX_DROP_MONITOR ;
@@ -2032,6 +2033,10 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_if (ieee80211_drop_unencrypted (rx, mgmt->frame_control))return RX_DROP_MONITOR ; + rxs =ieee80211_work_rx_mgmt (rx->sdata, rx->skb); +if (rxs !=RX_CONTINUE ) +return rxs; +if (ieee80211_vif_is_mesh (&sdata->vif))return ieee80211_mesh_rx_mgmt (sdata, rx->skb);
Johannes Berg
maintainerPATCH 6/6 mac80211: rewrite a few work messages
In reply to Johannes BergThe station we're authenticating/associating with may not always be an AP in the sense that word is mostly understood, so print only the MAC address of the peer instead.
--- net/mac80211/work.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
net/mac80211/work.c +10 -10
@@ -376,7 +376,7 @@ ieee80211_direct_probe(struct ieee80211_ wk->probe_auth.tries++;if (wk->probe_auth.tries >IEEE80211_AUTH_MAX_TRIES ) { -printk (KERN_DEBUG "%s: direct probe to AP %pM timed out\n" , +printk (KERN_DEBUG "%s: direct probe to %pM timed out\n" , sdata->name, wk->filter_ta);/*
@@ -394,7 +394,7 @@ ieee80211_direct_probe(struct ieee80211_return WORK_ACT_TIMEOUT ; } -printk (KERN_DEBUG "%s: direct probe to AP %pM (try %d)\n" , +printk (KERN_DEBUG "%s: direct probe to %pM (try %d)\n" , sdata->name, wk->filter_ta, wk->probe_auth.tries);/*
@@ -419,7 +419,7 @@ ieee80211_authenticate(struct ieee80211_ wk->probe_auth.tries++;if (wk->probe_auth.tries >IEEE80211_AUTH_MAX_TRIES ) { -printk (KERN_DEBUG "%s: authentication with AP %pM" +printk (KERN_DEBUG "%s: authentication with %pM" " timed out\n" , sdata->name, wk->filter_ta);/*
@@ -437,7 +437,7 @@ ieee80211_authenticate(struct ieee80211_return WORK_ACT_TIMEOUT ; } -printk (KERN_DEBUG "%s: authenticate with AP %pM (try %d)\n" , +printk (KERN_DEBUG "%s: authenticate with %pM (try %d)\n" , sdata->name, wk->filter_ta, wk->probe_auth.tries); ieee80211_send_auth(sdata, 1, wk->probe_auth.algorithm, wk->ie,
@@ -458,7 +458,7 @@ ieee80211_associate(struct ieee80211_wor wk->assoc.tries++;if (wk->assoc.tries >IEEE80211_ASSOC_MAX_TRIES ) { -printk (KERN_DEBUG "%s: association with AP %pM" +printk (KERN_DEBUG "%s: association with %pM" " timed out\n" , sdata->name, wk->filter_ta);
@@ -479,7 +479,7 @@ ieee80211_associate(struct ieee80211_worreturn WORK_ACT_TIMEOUT ; } -printk (KERN_DEBUG "%s: associate with AP %pM (try %d)\n" , +printk (KERN_DEBUG "%s: associate with %pM (try %d)\n" , sdata->name, wk->filter_ta, wk->assoc.tries);ieee80211_send_assoc (sdata, wk);
@@ -592,9 +592,9 @@ ieee80211_rx_mgmt_assoc_resp(struct ieeeu32 tu, ms; tu =get_unaligned_le32 (elems.timeout_int +1 ); ms = tu *1024 /1000 ; -printk (KERN_DEBUG "%s: AP rejected association temporarily; " +printk (KERN_DEBUG "%s: %pM rejected association temporarily; " "comeback duration %u TU (%u ms)\n" , - sdata->name, tu, ms); + sdata->name, mgmt->sa, tu, ms); wk->timeout = jiffies +msecs_to_jiffies (ms);if (ms >IEEE80211_ASSOC_TIMEOUT )run_again (local, wk->timeout);
@@ -602,8 +602,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee }if (status_code !=WLAN_STATUS_SUCCESS ) -printk (KERN_DEBUG "%s: AP denied association (code=%d)\n" , - sdata->name, status_code); +printk (KERN_DEBUG "%s: %pM denied association (code=%d)\n" , + sdata->name, mgmt->sa, status_code);else printk (KERN_DEBUG "%s: associated\n" , sdata->name);
Johannes Berg
maintainerPATCH v2 5/6 mac80211: generalise work handling
In reply to Johannes BergIn order to use auth/assoc for different purposes other than MLME, it needs to be split up. For other purposes, a generic work handling (potentially on another channel) will be useful.
To achieve that, this patch moves much of the MLME work handling out of mlme into a new work API. The API can currently handle probing a specific AP, authentication and association. The MLME previously handled probe/authentication as one step and will continue to do so, but they are separate in the new work handling.
Work items are RCU-managed to be able to check for existence of an item for a specific frame in the RX path, but they can be re-used which the MLME right now will do for its combined probe/auth step.
---
v2: fix locking/freeing in mgd_deauth()
net/mac80211/Makefile | 2 net/mac80211/debugfs_netdev.c | 2 net/mac80211/ieee80211_i.h | 59 +- net/mac80211/iface.c | 11 net/mac80211/main.c | 2 net/mac80211/mlme.c | 956 ++++++------------------------------------ net/mac80211/rx.c | 5 net/mac80211/scan.c | 8 net/mac80211/work.c | 902 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 1112 insertions(+), 835 deletions(-)
net/mac80211/Makefile +1 -1
@@ -9,7 +9,7 @@ mac80211-y := \ scan.o \ ht.o agg-tx.o agg-rx.o \ ibss.o \ - mlme.o \ + mlme.o work.o \ iface.o \ rate.o \ michael.o \
net/mac80211/ieee80211_i.h +44 -15
134 lines not on this page · raw message
net/mac80211/iface.c +9 -2
@@ -362,6 +362,11 @@ static int ieee80211_stop(struct net_devnetif_stop_queue (dev);/* +* Purge work for this interface. +*/ +ieee80211_work_purge (sdata); + +/* * Now delete all active aggregation sessions. */ rcu_read_lock ();
@@ -937,6 +942,9 @@ u32 __ieee80211_recalc_idle(struct ieee8struct ieee80211_sub_if_data *sdata;int count =0 ; +if (!list_empty (&local->work_list)) +return ieee80211_idle_off (local,"working" ); +if (local->scanning)return ieee80211_idle_off (local,"scanning" );
@@ -945,8 +953,7 @@ u32 __ieee80211_recalc_idle(struct ieee8continue ;/* do not count disabled managed interfaces */ if (sdata->vif.type ==NL80211_IFTYPE_STATION && - !sdata->u.mgd.associated && -list_empty (&sdata->u.mgd.work_list)) + !sdata->u.mgd.associated)continue ;/* do not count unused IBSS interfaces */ if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
net/mac80211/mlme.c +147 -809
1,213 lines not on this page · raw message
net/mac80211/scan.c +2 -6
@@ -422,7 +422,6 @@ static int __ieee80211_start_scan(struct struct cfg80211_scan_request *req) {struct ieee80211_local *local = sdata->local; -struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;int rc;if (local->scan_req)
@@ -452,11 +451,8 @@ static int __ieee80211_start_scan(struct local->scan_req = req; local->scan_sdata = sdata; -if (req != local->int_scan_req && - sdata->vif.type ==NL80211_IFTYPE_STATION && - !list_empty (&ifmgd->work_list)) { -/* actually wait for the work it's doing to finish/time out */ -set_bit (IEEE80211_STA_REQ_SCAN , &ifmgd->request); +if (!list_empty (&local->work_list)) { +/* wait for the work to finish/time out */ return 0 ; }
net/mac80211/work.c new file +902 -0
902 lines not on this page · raw message
net/mac80211/debugfs_netdev.c +0 -2
@@ -133,7 +133,6 @@ IEEE80211_IF_FILE(max_ratectrl_rateidx,/* STA attributes */ IEEE80211_IF_FILE (bssid, u.mgd.bssid,MAC );IEEE80211_IF_FILE (aid, u.mgd.aid,DEC ); -IEEE80211_IF_FILE (capab, u.mgd.capab,HEX );static int ieee80211_set_smps (struct ieee80211_sub_if_data *sdata,enum ieee80211_smps_mode smps_mode)
@@ -270,7 +269,6 @@ static void add_sta_files(struct ieee802DEBUGFS_ADD (bssid, sta);DEBUGFS_ADD (aid, sta); -DEBUGFS_ADD (capab, sta);DEBUGFS_ADD_MODE (smps,0600 ); }
net/mac80211/main.c +2 -0
@@ -395,6 +395,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(INIT_DELAYED_WORK (&local->scan_work, ieee80211_scan_work); +ieee80211_work_init (local); +INIT_WORK (&local->restart_work, ieee80211_restart_work);INIT_WORK (&local->reconfig_filter, ieee80211_reconfig_filter);
net/mac80211/rx.c +5 -0
@@ -2025,6 +2025,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ {struct ieee80211_sub_if_data *sdata = rx->sdata;struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) rx->skb->data; +ieee80211_rx_result rxs;if (!(rx->flags &IEEE80211_RX_RA_MATCH ))return RX_DROP_MONITOR ;
@@ -2032,6 +2033,10 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_if (ieee80211_drop_unencrypted (rx, mgmt->frame_control))return RX_DROP_MONITOR ; + rxs =ieee80211_work_rx_mgmt (rx->sdata, rx->skb); +if (rxs !=RX_CONTINUE ) +return rxs; +if (ieee80211_vif_is_mesh (&sdata->vif))return ieee80211_mesh_rx_mgmt (sdata, rx->skb);