linux-next: manual merge of the wireless tree with Linus' tree
in [Kernel]
|
Prev: [PATCH 2/8 v2]Bluetooth: Fix warning: variable 'tty' set but not used
Next: linux-next: manual merge of the net tree with the net-current tree
From: Stephen Rothwell on 14 Jun 2010 22:10 Hi John, Today's linux-next merge of the wireless tree got a conflict in net/mac80211/mlme.c between commit b054b747a694927879c94dd11af54d04346aed7d ("mac80211: fix deauth before assoc") from Linus' tree and commit 36b3a628a4e85d002ee8813ebd2a5caef6d3c1a7 ("mac80211: common work skb freeing") from the wireless tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc net/mac80211/mlme.c index 8fb85c3,74479c2..0000000 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@@ -1760,47 -1708,8 +1708,45 @@@ void ieee80211_sta_rx_queued_mgmt(struc mutex_unlock(&ifmgd->mtx); if (skb->len >= 24 + 2 /* mgmt + deauth reason */ && - (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) + (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) { + struct ieee80211_local *local = sdata->local; + struct ieee80211_work *wk; + + mutex_lock(&local->work_mtx); + list_for_each_entry(wk, &local->work_list, list) { + if (wk->sdata != sdata) + continue; + + if (wk->type != IEEE80211_WORK_ASSOC) + continue; + + if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN)) + continue; + if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN)) + continue; + + /* + * Printing the message only here means we can't + * spuriously print it, but it also means that it + * won't be printed when the frame comes in before + * we even tried to associate or in similar cases. + * + * Ultimately, I suspect cfg80211 should print the + * messages instead. + */ + printk(KERN_DEBUG + "%s: deauthenticated from %pM (Reason: %u)\n", + sdata->name, mgmt->bssid, + le16_to_cpu(mgmt->u.deauth.reason_code)); + + list_del_rcu(&wk->list); + free_work(wk); + break; + } + mutex_unlock(&local->work_mtx); + cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len); + } - out: - kfree_skb(skb); } static void ieee80211_sta_timer(unsigned long data) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: John W. Linville on 15 Jun 2010 10:50
On Tue, Jun 15, 2010 at 12:00:48PM +1000, Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless tree got a conflict in > net/mac80211/mlme.c between commit > b054b747a694927879c94dd11af54d04346aed7d ("mac80211: fix deauth before > assoc") from Linus' tree and commit > 36b3a628a4e85d002ee8813ebd2a5caef6d3c1a7 ("mac80211: common work skb > freeing") from the wireless tree. > > Just context changes. I fixed it up (see below) and can carry the fix > for a while. Yes, that looks correct. I will get the merge sorted-out when I send the next pull request to Dave, probably this week. Thanks, John -- John W. Linville Someday the world will need a hero, and you linville(a)tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |