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-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c
This commit is contained in:
John W. Linville
2010-09-24 15:52:34 -04:00
parent 6e5c2b4e8a cd87a2d3a3
commit 29ad2facd4
14 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/p54/txrx.c
View File

@@ -446,7 +446,7 @@ static void p54_rx_frame_sent(struct p54_common *priv, struct sk_buff *skb)
}
if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
(!payload->status))
!(payload->status & P54_TX_FAILED))
info->flags |= IEEE80211_TX_STAT_ACK;
if (payload->status & P54_TX_PSM_CANCELLED)
info->flags |= IEEE80211_TX_STAT_TX_FILTERED;