Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bc3e17c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

parents fee9dee7 ddd68587

MAINTAINERS

+5 −3
Original line number Diff line number Diff line
@@ -2449,13 +2449,15 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp 
S:	Maintained



MAC80211

P:	Jiri Benc

M:	jbenc@suse.cz

P:	Michael Wu

M:	flamingice@sourmilk.net

P:	Johannes Berg

M:	johannes@sipsolutions.net

P:	Jiri Benc

M:	jbenc@suse.cz

L:	linux-wireless@vger.kernel.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

net/mac80211/ieee80211_sta.c

+3 −2
Original line number Diff line number Diff line
@@ -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)