Please pull 'fixes-davem' branch of wireless-2.6 (Use this one!)
From: John W. Linville <hidden>
Date: 2007-10-26 04:34:09
Also in:
linux-wireless
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
Dave, (Use this one!) A few fixes for 2.6.24...also adds Johannes Berg as a mac80211 maintainer, since he probably wrote most of the newest bugs there... :-) Thanks, John --- Individual patches available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/fixes-davem --- The following changes since commit c9927c2bf4f45bb85e8b502ab3fb79ad6483c244: Linus Torvalds (1): Linux 2.6.24-rc1 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-davem Johannes Berg (2): add myself as mac80211 maintainer mac80211: fix printk warning on 64-bit Michael Wu (1): mac80211: Fix SSID matching in AP selection MAINTAINERS | 8 +++++--- net/mac80211/ieee80211_sta.c | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 76b8571..71badfb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS@@ -2442,13 +2442,15 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp S: Maintained MAC80211 -P: Jiri Benc -M: jbenc-AlSwsSmVLrQ@public.gmane.org P: Michael Wu M: flamingice-R9e9/4HEdknk1uMJSBkQmQ@public.gmane.org +P: Johannes Berg +M: johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org +P: Jiri Benc +M: jbenc-AlSwsSmVLrQ@public.gmane.org L: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org W: http://linuxwireless.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git +T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git S: Maintained MACVLAN DRIVER
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index f7ffeec..fda0e06 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c@@ -1184,7 +1184,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev, printk(KERN_DEBUG "%s: RX %sssocResp from %s (capab=0x%x " "status=%d aid=%d)\n", dev->name, reassoc ? "Rea" : "A", print_mac(mac, mgmt->sa), - capab_info, status_code, aid & ~(BIT(15) | BIT(14))); + capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14)))); if (status_code != WLAN_STATUS_SUCCESS) { printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
@@ -2096,7 +2096,8 @@ static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta, { int tmp, hidden_ssid; - if (!memcmp(ifsta->ssid, ssid, ssid_len)) + if (ssid_len == ifsta->ssid_len && + !memcmp(ifsta->ssid, ssid, ssid_len)) return 1; if (ifsta->flags & IEEE80211_STA_AUTO_BSSID_SEL)
--
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org