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 | cfg80211: add some documentation (diff) | |
| parent | iwlwifi: use long monitor timer for 5300 series (diff) | |
| download | linux-dev-268bae0b6879f238ba57f5f801958d1254e136f7.tar.xz linux-dev-268bae0b6879f238ba57f5f801958d1254e136f7.zip | |
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, 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; } |