From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public•gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public•gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Subject: Please pull 'fixes-davem' branch of wireless-2.6
Date: Thu, 25 Oct 2007 23:10:33 -0400 [thread overview]
Message-ID: <20071026031033.GC14080@tuxdriver.com> (raw)
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(-)
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..0d996aa 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -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)
--
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public•gmane.org
next reply other threads:[~2007-10-26 3:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-26 3:10 John W. Linville [this message]
2007-10-26 4:11 ` Please pull 'fixes-davem' branch of wireless-2.6 John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2008-01-16 21:26 John W. Linville
[not found] ` <20080116212645.GD3164-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2008-01-18 12:33 ` David Miller
2008-01-08 5:14 John W. Linville
[not found] ` <20080108051425.GA3125-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2008-01-08 5:21 ` David Miller
2007-12-20 15:52 John W. Linville
[not found] ` <20071220155227.GE3139-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-12-25 6:07 ` David Miller
2007-12-17 20:54 John W. Linville
2007-12-18 6:56 ` David Miller
2007-11-30 3:31 John W. Linville
2007-11-30 12:34 ` Herbert Xu
2007-11-20 22:10 John W. Linville
[not found] ` <20071120221025.GH16090-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-11-21 1:25 ` David Miller
2007-11-15 2:51 John W. Linville
2007-11-15 3:40 ` David Miller
2007-11-07 0:13 John W. Linville
2007-11-07 14:38 ` Michael Buesch
[not found] ` <20071107001314.GH4440-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-11-07 18:51 ` John W. Linville
2007-11-08 0:32 ` David Miller
2007-10-18 22:08 John W. Linville
[not found] ` <20071018220859.GG8510-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-10-19 4:57 ` David Miller
2007-10-17 2:31 John W. Linville
[not found] ` <20071017023145.GA2848-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-10-17 3:29 ` Michael Wu
2007-10-17 14:53 ` John W. Linville
2007-09-15 13:15 John W. Linville
2007-08-15 0:32 John W. Linville
[not found] ` <20070815003234.GI7198-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-08-15 1:33 ` David Miller
2007-08-06 20:13 John W. Linville
2007-08-08 1:08 ` David Miller
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=20071026031033.GC14080@tuxdriver.com \
--to=linville-2xusbdqka4r54taoqtywwq@public$(echo .)gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public$(echo .)gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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