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

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Browse Source 
Conflicts:
	drivers/net/wireless/mac80211_hwsim.c
This commit is contained in:
John W. Linville
2012-08-21 16:00:21 -04:00
parent 22c5649eef dcf33963c4
commit 01e17dacd4
84 changed files with 1241 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/b43/main.c
View File

@@ -3407,7 +3407,8 @@ static void b43_tx_work(struct work_struct *work)
}
static void b43_op_tx(struct ieee80211_hw *hw,
struct sk_buff *skb)
struct ieee80211_tx_control *control,
struct sk_buff *skb)
{
struct b43_wl *wl = hw_to_b43_wl(hw);