xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c
This commit is contained in:
John W. Linville
2011-08-22 14:28:50 -04:00
parent ca1ba7caa6 af2bf4b4ee
commit b38d355eaa
321 changed files with 22572 additions and 54163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
net/mac80211/cfg.c
View File

@@ -1898,33 +1898,6 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
*cookie = (unsigned long) skb;
if (is_offchan && local->ops->offchannel_tx) {
int ret;
IEEE80211_SKB_CB(skb)->band = chan->band;
mutex_lock(&local->mtx);
if (local->hw_offchan_tx_cookie) {
mutex_unlock(&local->mtx);
return -EBUSY;
}
/* TODO: bitrate control, TX processing? */
ret = drv_offchannel_tx(local, skb, chan, channel_type, wait);
if (ret == 0)
local->hw_offchan_tx_cookie = *cookie;
mutex_unlock(&local->mtx);
/*
* Allow driver to return 1 to indicate it wants to have the
* frame transmitted with a remain_on_channel + regular TX.
*/
if (ret != 1)
return ret;
}
if (is_offchan && local->ops->remain_on_channel) {
unsigned int duration;
int ret;
@@ -2011,18 +1984,6 @@ static int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
mutex_lock(&local->mtx);
if (local->ops->offchannel_tx_cancel_wait &&
local->hw_offchan_tx_cookie == cookie) {
ret = drv_offchannel_tx_cancel_wait(local);
if (!ret)
local->hw_offchan_tx_cookie = 0;
mutex_unlock(&local->mtx);
return ret;
}
if (local->ops->cancel_remain_on_channel) {
cookie ^= 2;
ret = ieee80211_cancel_remain_on_channel_hw(local, cookie);