lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c
	net/wireless/nl80211.c
This commit is contained in:
John W. Linville
2011-09-28 10:28:09 -04:00
parent cd32984f64 ba54238552
commit 0874073570
9 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/rtlwifi/usb.c
View File

@@ -863,6 +863,7 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, struct sk_buff *skb,
u8 tid = 0;
u16 seq_number = 0;
memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
if (ieee80211_is_auth(fc)) {
RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));
rtl_ips_nic_on(hw);