From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>
Subject: linux-next: manual merge of the wireless tree with Linus' tree
Date: Tue, 15 Jun 2010 12:00:48 +1000 [thread overview]
Message-ID: <20100615120048.5d497ce1.sfr@canb.auug.org.au> (raw)
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@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)
next reply other threads:[~2010-06-15 2:00 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-15 2:00 Stephen Rothwell [this message]
2010-06-15 14:42 ` linux-next: manual merge of the wireless tree with Linus' tree John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2014-02-14 0:19 Stephen Rothwell
2012-01-04 1:40 Stephen Rothwell
2011-09-20 3:28 Stephen Rothwell
2011-09-20 12:55 ` John W. Linville
2011-09-20 3:22 Stephen Rothwell
2011-09-19 5:14 Stephen Rothwell
2011-09-19 5:28 ` Luciano Coelho
2011-09-15 3:14 Stephen Rothwell
2011-09-15 7:17 ` Helmut Schaa
2011-09-15 3:14 Stephen Rothwell
2011-08-30 3:46 Stephen Rothwell
2011-05-12 1:42 Stephen Rothwell
2011-05-11 1:52 Stephen Rothwell
2011-04-27 1:00 Stephen Rothwell
2011-04-13 2:30 Stephen Rothwell
2011-04-08 4:10 Stephen Rothwell
2011-04-08 5:11 ` Jussi Kivilinna
2011-04-08 4:10 Stephen Rothwell
2010-09-21 2:20 Stephen Rothwell
2010-09-21 2:09 Stephen Rothwell
2010-09-21 6:53 ` Ohad Ben-Cohen
2010-09-21 8:57 ` Ohad Ben-Cohen
2010-09-21 15:08 ` John W. Linville
2010-08-17 1:52 Stephen Rothwell
2010-08-17 2:59 ` Rusty Russell
2010-08-17 3:07 ` Stephen Rothwell
2010-05-10 1:27 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-01-06 2:29 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100615120048.5d497ce1.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).