diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-09 17:01:37 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-09 17:01:37 +0100 |
| commit | a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae (patch) | |
| tree | facc20b09719093ea35cd05374f31b34df95ae15 /drivers/net/wireless/rtlwifi/rtl8723ae | |
| parent | net: prevent setting ttl=0 via IP_TTL (diff) | |
| parent | b43: Fix firmware loading when driver is built into the kernel (diff) | |
| download | linux-a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae.tar.xz linux-a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8723ae')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c index 39cc7938eedf..3d8536bb0d2b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c @@ -1106,7 +1106,7 @@ u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw) if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) { rtl8723ae_phy_sw_chnl_callback(hw); RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD, - "sw_chnl_inprogress false schdule workitem\n"); + "sw_chnl_inprogress false schedule workitem\n"); rtlphy->sw_chnl_inprogress = false; } else { RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD, |