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/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
This commit is contained in:
John W. Linville
2010-08-24 16:35:40 -04:00
parent d70e96932d 6a017e043a
commit 268bae0b68
24 changed files with 174 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mac80211_hwsim.c
View File

@@ -487,7 +487,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
struct ieee80211_rx_status rx_status;
if (data->idle) {
wiphy_debug(hw->wiphy, "trying to tx when idle - reject\n");
wiphy_debug(hw->wiphy, "Trying to TX when idle - reject\n");
return false;
}