Please pull 'fixes-davem' branch of wireless-2.6
Subsystems (3)
Dave,
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
Jeff Garzik (1):
mac80211: fix warning created by BIT()
Johannes Berg (1):
add myself as mac80211 maintainer
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(-)
MAINTAINERS +5 -3
@@ -2442,13 +2442,15 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp S: Maintained MAC80211 -P: Jiri Benc -M: [email protected] P: Michael Wu M: flamingice-R9e9/[email protected] +P: Johannes Berg +M: [email protected] +P: Jiri Benc +M: [email protected] L: [email protected] 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
net/mac80211/ieee80211_sta.c +3 -2
@@ -1182,7 +1182,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev, aid =le16_to_cpu (mgmt->u.assoc_resp.aid);printk (KERN_DEBUG "%s: RX %sssocResp from %s (capab=0x%x " -"status=%d aid=%d)\n" , +"status=%d aid=%ld)\n" , dev->name, reassoc ?"Rea" :"A" ,print_mac (mac, mgmt->sa), capab_info, status_code, aid & ~(BIT (15 ) |BIT (14 )));
@@ -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 )
Signature · 2 lines
John W. Linville [email protected]
Quoted 10 lines · John W. Linville
The following changes since commit
c9927c2bf4f45bb85e8b502ab3fb79ad6483c244:
Linus Torvalds (1):Linux 2.6.24-rc1are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitfixes-davemJeff Garzik (1):
mac80211: fix warning created byBIT()
Hmmm...this doesn't actually seem to fix the warning -- oops!
Disregard this request, I'll apply Johannes' fix instead and send another pull request.
John
Signature · 2 lines
John W. Linville [email protected]