leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h
This commit is contained in:
John W. Linville
2010-07-13 15:57:29 -04:00
parent 242647bcf8 815868e7b5
commit e300d955de
106 changed files with 9726 additions and 8521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/wireless/mlme.c
View File

@@ -44,10 +44,10 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len)
}
}
WARN_ON(!done);
nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
cfg80211_sme_rx_auth(dev, buf, len);
if (done) {
nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
cfg80211_sme_rx_auth(dev, buf, len);
}
wdev_unlock(wdev);
}

2
net/wireless/nl80211.c
View File

@@ -877,7 +877,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
int idx, mbm = 0;
if (!rdev->ops->set_tx_power) {
return -EOPNOTSUPP;
result = -EOPNOTSUPP;
goto bad_res;
}