diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:09:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:09:54 -0400 |
| commit | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da (patch) | |
| tree | 144b686bf3fd6512a55987da2d911f739646ce02 /drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | |
| parent | 6fe5468f452c0c40348ebd4e737758a842286ca8 (diff) | |
| parent | ddc4db2e3d5393ede7a9222bb3b7522a603a4678 (diff) | |
| download | op-kernel-dev-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.zip op-kernel-dev-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/ath/carl9170/debug.c
drivers/net/wireless/ath/carl9170/main.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8188ee/trx.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c index d075237..a8871d6 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c @@ -421,8 +421,8 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD, "Get Wakeup Packet!! WakeMatch =%d\n", status->wake_match); - rx_status->freq = hw->conf.channel->center_freq; - rx_status->band = hw->conf.channel->band; + rx_status->freq = hw->conf.chandef.chan->center_freq; + rx_status->band = hw->conf.chandef.chan->band; if (status->crc) rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; |
