pull request: wireless 2014-10-31
Subsystems (4)
Dave,
Please pull this small batch of spooky fixes intended for the 3.18 stream...boo!
Cyril Brulebois adds an rt2x00 device ID.
Dan Carpenter provides a one-line masking fix for an ath9k debugfs entry.
Larry Finger gives us a package of small rtlwifi fixes which add some bits that were left out of some feature updates that were included in the merge window. Hopefully this isn't a sign that the rtlwifi base is getting too big...
Marc Yang brings a fix for a temporary mwifiex stall when doing 11n RX reordering.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 99c814066e75d09e6a38574c6c395f022a04b730:
Merge tag 'mac80211-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2014-10-27 13:38:15 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git tags/master-2014-10-30
for you to fetch changes up to 75a916e1944fea8347d2245c62567187e4eff9dd:
rtlwifi: rtl8192se: Fix firmware loading (2014-10-30 15:00:23 -0400)
----------------------------------------------------------------
Cyril Brulebois (1):
wireless: rt2x00: add new rt2800usb device
Dan Carpenter (1):
ath9k: fix some debugfs output
Larry Finger (5):
rtlwifi: rtl8192ce: rtl8192de: rtl8192se: Fix handling for missing get_btc_status
rtlwifi: rtl8192se: Fix duplicate calls to ieee80211_register_hw()
rtlwifi: rtl8192se: Add missing section to read descriptor setting
rtlwifi: rtl8192ce: Add missing section to read descriptor setting
rtlwifi: rtl8192se: Fix firmware loading
Marc Yang (1):
mwifiex: restart rxreorder timer correctly
drivers/net/wireless/ath/ath9k/debug.c | 2 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 52 +++++++++++++++++++++------- drivers/net/wireless/mwifiex/11n_rxreorder.h | 2 ++ drivers/net/wireless/mwifiex/main.h | 1 + drivers/net/wireless/rt2x00/rt2800usb.c | 1 + drivers/net/wireless/rtlwifi/core.c | 6 ++++ drivers/net/wireless/rtlwifi/core.h | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 2 ++ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 3 ++ drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 1 + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 ++ drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 22 ++---------- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 3 ++ 14 files changed, 67 insertions(+), 32 deletions(-)
drivers/net/wireless/ath/ath9k/debug.c +1 -1
@@ -455,7 +455,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,"%2d %2x %1x %2x %2x\n" , i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset, (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset +3 ), - val[2 ] & (0x7 << (i *3 )) >> (i *3 ), + (val[2 ] & (0x7 << (i *3 ))) >> (i *3 ), (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset); }
drivers/net/wireless/mwifiex/11n_rxreorder.c +40 -12
121 lines not on this page · raw message
drivers/net/wireless/mwifiex/11n_rxreorder.h +2 -0
@@ -21,6 +21,8 @@#define _MWIFIEX_11N_RXREORDER_H_#define MIN_FLUSH_TIMER_MS 50 +#define MIN_FLUSH_TIMER_15_MS 15 +#define MWIFIEX_BA_WIN_SIZE_32 32#define PKT_TYPE_BAR 0xE7#define MAX_TID_VALUE (2 << 11)
drivers/net/wireless/mwifiex/main.h +1 -0
@@ -592,6 +592,7 @@ struct reorder_tmr_cnxt {struct timer_list timer;struct mwifiex_rx_reorder_tbl *ptr;struct mwifiex_private *priv; +u8 timer_is_set; };struct mwifiex_rx_reorder_tbl {
drivers/net/wireless/rt2x00/rt2800usb.c +1 -0
@@ -1111,6 +1111,7 @@ static struct usb_device_id rt2800usb_device_table[] = {/* Ovislink */ { USB_DEVICE(0x1b75, 0x3071) }, { USB_DEVICE(0x1b75, 0x3072) }, + { USB_DEVICE(0x1b75, 0xa200) },/* Para */ { USB_DEVICE(0x20b8, 0x8888) },/* Pegatron */
drivers/net/wireless/rtlwifi/core.c +6 -0
@@ -1828,3 +1828,9 @@ const struct ieee80211_ops rtl_ops = { .flush = rtl_op_flush, };EXPORT_SYMBOL_GPL (rtl_ops); + +bool rtl_btc_status_false (void ) +{ +return false; +} +EXPORT_SYMBOL_GPL (rtl_btc_status_false);
drivers/net/wireless/rtlwifi/core.h +1 -0
@@ -42,5 +42,6 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr, u32 mask, u32 data);void rtl_bb_delay (struct ieee80211_hw *hw,u32 addr,u32 data);bool rtl_cmd_send_packet (struct ieee80211_hw *hw,struct sk_buff *skb); +bool rtl_btc_status_false (void );#endif
drivers/net/wireless/rtlwifi/rtl8192ce/def.h +2 -0
@@ -114,6 +114,8 @@ LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)#define GET_C2H_CMD_FEEDBACK_CCX_SEQ (__pcmdfbhdr) \ LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12) +#define GET_RX_STATUS_DESC_BUFF_ADDR (__pdesc) \ + SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32)#define CHIP_VER_B BIT(4)#define CHIP_BONDING_IDENTIFIER (_value) (((_value) >> 22) & 0x3)
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +1 -0
@@ -244,6 +244,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { .phy_lc_calibrate = _rtl92ce_phy_lc_calibrate, .phy_set_bw_mode_callback = rtl92ce_phy_set_bw_mode_callback, .dm_dynamic_txpower = rtl92ce_dm_dynamic_txpower, + .get_btc_status = rtl_btc_status_false, };static struct rtl_mod_params rtl92ce_mod_params = {
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +3 -0
@@ -728,6 +728,9 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)case HW_DESC_RXPKT_LEN : ret =GET_RX_DESC_PKT_LEN (pdesc);break ; +case HW_DESC_RXBUFF_ADDR : + ret =GET_RX_STATUS_DESC_BUFF_ADDR (pdesc); +break ;default :RT_ASSERT (false,"ERR rxdesc :%d not process\n" , desc_name);
drivers/net/wireless/rtlwifi/rtl8192de/sw.c +1 -0
@@ -251,6 +251,7 @@ static struct rtl_hal_ops rtl8192de_hal_ops = { .get_rfreg = rtl92d_phy_query_rf_reg, .set_rfreg = rtl92d_phy_set_rf_reg, .linked_set_reg = rtl92d_linked_set_reg, + .get_btc_status = rtl_btc_status_false, };static struct rtl_mod_params rtl92de_mod_params = {
drivers/net/wireless/rtlwifi/rtl8192se/def.h +2 -0
@@ -446,6 +446,8 @@/* DWORD 6 */ #define SET_RX_STATUS__DESC_BUFF_ADDR (__pdesc, __val) \ SET_BITS_OFFSET_LE(__pdesc + 24, 0, 32, __val) +#define GET_RX_STATUS_DESC_BUFF_ADDR (__pdesc) \ + SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32)#define SE_RX_HAL_IS_CCK_RATE (_pdesc)\ (GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE1M || \
drivers/net/wireless/rtlwifi/rtl8192se/sw.c +3 -19
@@ -87,11 +87,8 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)static void rtl92se_fw_cb (const struct firmware *firmware,void *context) {struct ieee80211_hw *hw = context; -struct rtl_pci_priv *pcipriv =rtl_pcipriv (hw);struct rtl_priv *rtlpriv =rtl_priv (hw); -struct rtl_pci *rtlpci =rtl_pcidev (pcipriv);struct rt_firmware *pfirmware =NULL ; -int err;RT_TRACE (rtlpriv,COMP_ERR ,DBG_LOUD ,"Firmware callback routine entered!\n" );
@@ -112,20 +109,6 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)memcpy (pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size); pfirmware->sz_fw_tmpbufferlen = firmware->size;release_firmware (firmware); - - err =ieee80211_register_hw (hw); -if (err) { -RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG , -"Can't register mac80211 hw\n" ); -return ; - }else { - rtlpriv->mac80211.mac80211_registered =1 ; - } - rtlpci->irq_alloc =1 ; -set_bit (RTL_STATUS_INTERFACE_START , &rtlpriv->status); - -/*init rfkill */ -rtl_init_rfkill (hw); }static int rtl92s_init_sw_vars (struct ieee80211_hw *hw)
@@ -226,8 +209,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)if (!rtlpriv->rtlhal.pfirmware)return 1 ; - rtlpriv->max_fw_size =RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE ; - + rtlpriv->max_fw_size =RTL8190_MAX_FIRMWARE_CODE_SIZE *2 + +sizeof (struct fw_hdr );pr_info ("Driver for Realtek RTL8192SE/RTL8191SE\n" "Loading firmware %s\n" , rtlpriv->cfg->fw_name);/* request fw */
@@ -294,6 +277,7 @@ static struct rtl_hal_ops rtl8192se_hal_ops = { .set_bbreg = rtl92s_phy_set_bb_reg, .get_rfreg = rtl92s_phy_query_rf_reg, .set_rfreg = rtl92s_phy_set_rf_reg, + .get_btc_status = rtl_btc_status_false, };static struct rtl_mod_params rtl92se_mod_params = {
drivers/net/wireless/rtlwifi/rtl8192se/trx.c +3 -0
@@ -640,6 +640,9 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name)case HW_DESC_RXPKT_LEN : ret =GET_RX_STATUS_DESC_PKT_LEN (desc);break ; +case HW_DESC_RXBUFF_ADDR : + ret =GET_RX_STATUS_DESC_BUFF_ADDR (desc); +break ;default :RT_ASSERT (false,"ERR rxdesc :%d not process\n" , desc_name);
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Fri, 31 Oct 2014 15:58:17 -0400
Quoted 2 lines
Please pull this small batch of spooky fixes intended for the 3.18 stream...boo!
Scary... but pulled.
Thanks a lot!