diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
| commit | b0477f5f8ec85bf8a82f6aa6eee308d72c418032 (patch) | |
| tree | d520be10a261f418dbf4539f1d2b5d48d74ba0d3 /drivers/net/wireless/rtlwifi/rtl8192ee/sw.c | |
| parent | 13a29d9ad242f0bf3b31afe812c81558d54892de (diff) | |
| parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.07-android
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ee/sw.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ee/sw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c index 9b5a7d5be121..c31c6bfb536d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c @@ -113,8 +113,6 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw) RCR_HTC_LOC_CTRL | RCR_AMF | RCR_ACF | - RCR_ADF | - RCR_AICV | RCR_ACRC32 | RCR_AB | RCR_AM | @@ -241,6 +239,7 @@ static struct rtl_hal_ops rtl8192ee_hal_ops = { .set_desc = rtl92ee_set_desc, .get_desc = rtl92ee_get_desc, .is_tx_desc_closed = rtl92ee_is_tx_desc_closed, + .get_available_desc = rtl92ee_get_available_desc, .tx_polling = rtl92ee_tx_polling, .enable_hw_sec = rtl92ee_enable_hw_security_config, .set_key = rtl92ee_set_key, |