diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:35:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:35:40 -0400 |
| commit | 268bae0b6879f238ba57f5f801958d1254e136f7 (patch) | |
| tree | 132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless/mac80211_hwsim.c | |
| parent | d70e96932de55fb2c05b1c0af1dff178651a9b77 (diff) | |
| parent | 6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index d9dd9f9d3040..298ba79fc51b 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
| @@ -487,7 +487,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, | |||
| 487 | struct ieee80211_rx_status rx_status; | 487 | struct ieee80211_rx_status rx_status; |
| 488 | 488 | ||
| 489 | if (data->idle) { | 489 | if (data->idle) { |
| 490 | wiphy_debug(hw->wiphy, "trying to tx when idle - reject\n"); | 490 | wiphy_debug(hw->wiphy, "Trying to TX when idle - reject\n"); |
| 491 | return false; | 491 | return false; |
| 492 | } | 492 | } |
| 493 | 493 | ||