diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-01 14:27:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-01 14:27:28 -0400 |
| commit | 45eb5168873c93b4f1c3c3867fea65aad4c6abd6 (patch) | |
| tree | 4949e1083f214ce51565d41614df912cba017219 /drivers/net/wireless/rtlwifi/rtl8192de/hw.c | |
| parent | b9600d2d0901cd0f91cb372e72bd53d22f49638d (diff) | |
| parent | 9374e7d2fdcad3c36dafc8d3effd554bc702c4b6 (diff) | |
| download | blackbird-op-linux-45eb5168873c93b4f1c3c3867fea65aad4c6abd6.tar.gz blackbird-op-linux-45eb5168873c93b4f1c3c3867fea65aad4c6abd6.zip | |
Merge tag 'wireless-drivers-next-for-davem-2015-04-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
Major changes:
ath9k:
* add Active Interference Cancellation, a method implemented in the HW
to counter WLAN RX > sensitivity degradation when BT is transmitting
at the same time. This feature is supported by cards like WB222
based on AR9462.
iwlwifi:
* Location Aware Regulatory was added by Arik
* 8000 device family work
* update to the BT Coex firmware API
brmcfmac:
* add new BCM43455 and BCM43457 SDIO device support
* add new BCM43430 SDIO device support
wil6210:
* take care of AP bridging
* fix NAPI behavior
* found approach to achieve 4*n+2 alignment of Rx frames
rt2x00:
* add new rt2800usb device DWA 130
rtlwifi:
* add USB ID for D-Link DWA-131
* add USB ID ASUS N10 WiFi dongle
mwifiex:
* throughput enhancements
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/hw.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c index 01bcc2d218dc..f49b60d31450 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c @@ -1126,7 +1126,7 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw, break; } - rtl_write_byte(rtlpriv, REG_CR + 2, bt_msr); + rtl_write_byte(rtlpriv, MSR, bt_msr); rtlpriv->cfg->ops->led_control(hw, ledaction); if ((bt_msr & MSR_MASK) == MSR_AP) rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); |
