pull request: wireless 2013-07-19
Subsystems (5)
Dave,
Please accept this batch of fixes intended for the 3.11 tree...
Alexey Khoroshilov fixes a suspend-related race in ath9k_htc.
Arnd Bergmann corrects the alignment of a structure in the ssb code to be compatible with ARM devices.
Bob Copeland provides an ath5k fix that corrects a mistaken variable initialization.
Felix Fietkau corrects some frame accounting for dropped frames in ath9k.
Geert Uytterhoeven brings a Kconfig fix to indicate the DMA requirements for rt2x00.
Larry Finger offers two rtlwifi fixes: one that properly initializes a callback; and, a scattered collection of Kconfig, Makefile, and EXPORT_SYMBOL changes that correct some build problems.
Finally, Sujith Manoharan provides an ath9k fix to disable a feature on a specific hardware device.
Please let me know if there are any problems!
Thanks,
John
---
The following changes since commit ecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-07-18 20:08:47 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 876fbb5d3ebab01685fef3839d245481c30eab5f:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-07-19 12:54:28 -0400)
----------------------------------------------------------------
Alexey Khoroshilov (1):
ath9k_htc: fix data race between request_firmware_nowait() callback and suspend()
Arnd Bergmann (1):
ssb: fix alignment of struct bcma_device_id
Bob Copeland (1):
ath5k: fix extra set bit in multicast mask
Felix Fietkau (1):
ath9k: fix tx pending frames accounting for dropped packets
Geert Uytterhoeven (1):
rt2x00: RT2X00 should depend on HAS_DMA
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Larry Finger (2):
rtlwifi: Initialize power-setting callback for USB devices
rtlwifi: Fix build errors for unusual cases
Sujith Manoharan (1):
ath9k_hw: Fix multicast search for AR9002 family
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 10 +++- drivers/net/wireless/ath/ath9k/hif_usb.c | 9 ++-- drivers/net/wireless/ath/ath9k/xmit.c | 44 ++++++++++------ drivers/net/wireless/rt2x00/Kconfig | 2 +- drivers/net/wireless/rtlwifi/Kconfig | 72 ++++++++++++++++++--------- drivers/net/wireless/rtlwifi/Makefile | 10 ++-- drivers/net/wireless/rtlwifi/base.c | 19 +++++-- drivers/net/wireless/rtlwifi/base.h | 2 +- drivers/net/wireless/rtlwifi/core.c | 1 + drivers/net/wireless/rtlwifi/debug.c | 1 + drivers/net/wireless/rtlwifi/efuse.c | 1 + drivers/net/wireless/rtlwifi/pci.c | 22 +++----- drivers/net/wireless/rtlwifi/ps.c | 16 ++++++ drivers/net/wireless/rtlwifi/ps.h | 1 + drivers/net/wireless/rtlwifi/usb.c | 9 ++++ include/linux/mod_devicetable.h | 5 +- 17 files changed, 154 insertions(+), 72 deletions(-)
drivers/net/wireless/ath/ath5k/mac80211-ops.c +1 -1
@@ -325,7 +325,7 @@ ath5k_prepare_multicast(struct ieee80211_hw *hw,struct netdev_hw_addr *ha; mfilt[0 ] =0 ; - mfilt[1 ] =1 ; + mfilt[1 ] =0 ;netdev_hw_addr_list_for_each (ha, mc_list) {/* calculate XOR of eight 6-bit values */
drivers/net/wireless/ath/ath9k/ar5008_phy.c +9 -1
@@ -610,7 +610,15 @@ static void ar5008_hw_override_ini(struct ath_hw *ah,REG_SET_BIT (ah,AR_DIAG_SW , (AR_DIAG_RX_DIS |AR_DIAG_RX_ABORT ));if (AR_SREV_9280_20_OR_LATER (ah)) { - val =REG_READ (ah,AR_PCU_MISC_MODE2 ); +/* +* For AR9280 and above, there is a new feature that allows +* Multicast search based on both MAC Address and Key ID. +* By default, this feature is enabled. But since the driver +* is not using this feature, we switch it off; otherwise +* multicast search based on MAC addr only will fail. +*/ + val =REG_READ (ah,AR_PCU_MISC_MODE2 ) & + (~AR_ADHOC_MCAST_KEYID_ENABLE );if (!AR_SREV_9271 (ah)) val &= ~AR_PCU_MISC_MODE2_HWWAR1 ;
drivers/net/wireless/ath/ath9k/hif_usb.c +6 -3
@@ -1082,7 +1082,7 @@ static void ath9k_hif_usb_firmware_fail(struct hif_device_usb *hif_dev)struct device *dev = &hif_dev->udev->dev;struct device *parent = dev->parent; -complete (&hif_dev->fw_done); +complete_all (&hif_dev->fw_done);if (parent)device_lock (parent);
@@ -1131,7 +1131,7 @@ static void ath9k_hif_usb_firmware_cb(const struct firmware *fw, void *context)release_firmware (fw); hif_dev->flags |=HIF_USB_READY ; -complete (&hif_dev->fw_done); +complete_all (&hif_dev->fw_done);return ;
@@ -1316,7 +1316,10 @@ static int ath9k_hif_usb_suspend(struct usb_interface *interface,if (!(hif_dev->flags &HIF_USB_START ))ath9k_htc_suspend (hif_dev->htc_handle); -ath9k_hif_usb_dealloc_urbs (hif_dev); +wait_for_completion (&hif_dev->fw_done); + +if (hif_dev->flags &HIF_USB_READY ) +ath9k_hif_usb_dealloc_urbs (hif_dev);return 0 ; }
drivers/net/wireless/ath/ath9k/xmit.c +28 -16
86 lines not on this page · raw message
drivers/net/wireless/rt2x00/Kconfig +1 -1
@@ -1,6 +1,6 @@ menuconfig RT2X00 tristate "Ralink driver support" - depends on MAC80211 + depends on MAC80211 && HAS_DMA ---help--- This will enable the support for the Ralink drivers, developed in the rt2x00 project <http://rt2x00.serialmonkey.com>.
drivers/net/wireless/rtlwifi/Kconfig +48 -24
117 lines not on this page · raw message
drivers/net/wireless/rtlwifi/Makefile +4 -6
@@ -12,13 +12,11 @@ rtlwifi-objs := \ rtl8192c_common-objs += \ -ifneq ($(CONFIG_PCI),) -rtlwifi-objs += pci.o -endif +obj-$(CONFIG_RTLWIFI_PCI) += rtl_pci.o +rtl_pci-objs := pci.o -ifneq ($(CONFIG_USB),) -rtlwifi-objs += usb.o -endif +obj-$(CONFIG_RTLWIFI_USB) += rtl_usb.o +rtl_usb-objs := usb.o obj-$(CONFIG_RTL8192C_COMMON) += rtl8192c/ obj-$(CONFIG_RTL8192CE) += rtl8192ce/
drivers/net/wireless/rtlwifi/base.c +16 -3
@@ -172,6 +172,7 @@ u8 rtl_tid_to_ac(u8 tid) {return tid_to_ac[tid]; } +EXPORT_SYMBOL_GPL (rtl_tid_to_ac);static void _rtl_init_hw_ht_capab (struct ieee80211_hw *hw,struct ieee80211_sta_ht_cap *ht_cap)
@@ -406,6 +407,7 @@ void rtl_deinit_deferred_work(struct ieee80211_hw *hw)cancel_delayed_work (&rtlpriv->works.ps_rfon_wq);cancel_delayed_work (&rtlpriv->works.fwevt_wq); } +EXPORT_SYMBOL_GPL (rtl_deinit_deferred_work);void rtl_init_rfkill (struct ieee80211_hw *hw) {
@@ -439,6 +441,7 @@ void rtl_deinit_rfkill(struct ieee80211_hw *hw) {wiphy_rfkill_stop_polling (hw->wiphy); } +EXPORT_SYMBOL_GPL (rtl_deinit_rfkill);int rtl_init_core (struct ieee80211_hw *hw) {
@@ -489,10 +492,12 @@ int rtl_init_core(struct ieee80211_hw *hw)return 0 ; } +EXPORT_SYMBOL_GPL (rtl_init_core);void rtl_deinit_core (struct ieee80211_hw *hw) { } +EXPORT_SYMBOL_GPL (rtl_deinit_core);void rtl_init_rx_config (struct ieee80211_hw *hw) {
@@ -501,6 +506,7 @@ void rtl_init_rx_config(struct ieee80211_hw *hw) rtlpriv->cfg->ops->get_hw_reg (hw,HW_VAR_RCR , (u8 *) (&mac->rx_conf)); } +EXPORT_SYMBOL_GPL (rtl_init_rx_config);/********************************************************* *
@@ -879,6 +885,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)return true; } +EXPORT_SYMBOL_GPL (rtl_tx_mgmt_proc); void rtl_get_tcb_desc(struct ieee80211_hw *hw, struct ieee80211_tx_info *info,
@@ -1052,6 +1059,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)return true; } +EXPORT_SYMBOL_GPL (rtl_action_proc);/*should call before software enc*/ u8 rtl_is_special_data (struct ieee80211_hw *hw,struct sk_buff *skb,u8 is_tx)
@@ -1125,6 +1133,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)return false; } +EXPORT_SYMBOL_GPL (rtl_is_special_data);/********************************************************* *
@@ -1300,6 +1309,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb) rtlpriv->link_info.bcn_rx_inperiod++; } +EXPORT_SYMBOL_GPL (rtl_beacon_statistic);void rtl_watchdog_wq_callback (void *data) {
@@ -1793,6 +1803,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) mac->vendor = vendor; } +EXPORT_SYMBOL_GPL (rtl_recognize_peer);/********************************************************* *
@@ -1849,6 +1860,7 @@ struct attribute_group rtl_attribute_group = { .name = "rtlsysfs", .attrs = rtl_sysfs_entries, }; +EXPORT_SYMBOL_GPL (rtl_attribute_group);MODULE_AUTHOR ("lizhaoming <[email protected]>" );MODULE_AUTHOR ("Realtek WlanFAE <[email protected]>" );
@@ -1856,7 +1868,8 @@ MODULE_AUTHOR("Larry Finger <[email protected]>");MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Realtek 802.11n PCI wireless core" ); -struct rtl_global_var global_var = {}; +struct rtl_global_var rtl_global_var = {}; +EXPORT_SYMBOL_GPL (rtl_global_var);static int __init rtl_core_module_init (void ) {
@@ -1864,8 +1877,8 @@ static int __init rtl_core_module_init(void)pr_err ("Unable to register rtl_rc, use default RC !!\n" );/* init some global vars */ -INIT_LIST_HEAD (&global_var.glb_priv_list); -spin_lock_init (&global_var.glb_list_lock); +INIT_LIST_HEAD (&rtl_global_var.glb_priv_list); +spin_lock_init (&rtl_global_var.glb_list_lock);return 0 ; }
drivers/net/wireless/rtlwifi/base.h +1 -1
@@ -147,7 +147,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);u8 rtl_tid_to_ac (u8 tid);extern struct attribute_group rtl_attribute_group;void rtl_easy_concurrent_retrytimer_callback (unsigned long data); -extern struct rtl_global_var global_var; +extern struct rtl_global_var rtl_global_var;int rtlwifi_rate_mapping (struct ieee80211_hw *hw,bool isht,u8 desc_rate,bool first_ampdu);bool rtl_tx_mgmt_proc (struct ieee80211_hw *hw,struct sk_buff *skb);
drivers/net/wireless/rtlwifi/core.c +1 -0
@@ -1330,3 +1330,4 @@ const struct ieee80211_ops rtl_ops = { .rfkill_poll = rtl_op_rfkill_poll, .flush = rtl_op_flush, }; +EXPORT_SYMBOL_GPL (rtl_ops);
drivers/net/wireless/rtlwifi/debug.c +1 -0
@@ -51,3 +51,4 @@ void rtl_dbgp_flag_init(struct ieee80211_hw *hw)/*Init Debug flag enable condition */ } +EXPORT_SYMBOL_GPL (rtl_dbgp_flag_init);
drivers/net/wireless/rtlwifi/efuse.c +1 -0
@@ -229,6 +229,7 @@ void read_efuse_byte(struct ieee80211_hw *hw, u16 _offset, u8 *pbuf) *pbuf = (u8) (value32 &0xff ); } +EXPORT_SYMBOL_GPL (read_efuse_byte);void read_efuse (struct ieee80211_hw *hw,u16 _offset,u16 _size_byte,u8 *pbuf) {
drivers/net/wireless/rtlwifi/pci.c +8 -14
@@ -35,6 +35,13 @@#include "efuse.h" #include <linux/export.h> #include <linux/kmemleak.h> +#include <linux/module.h> + +MODULE_AUTHOR ("lizhaoming <[email protected]>" ); +MODULE_AUTHOR ("Realtek WlanFAE <[email protected]>" ); +MODULE_AUTHOR ("Larry Finger <[email protected]>" ); +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("PCI basic driver for rtlwifi" );static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX ] = {PCI_VENDOR_ID_INTEL ,
@@ -1008,19 +1015,6 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)return ; } -static void rtl_lps_change_work_callback (struct work_struct *work) -{ -struct rtl_works *rtlworks = - container_of(work, struct rtl_works, lps_change_work); -struct ieee80211_hw *hw = rtlworks->hw; -struct rtl_priv *rtlpriv =rtl_priv (hw); - -if (rtlpriv->enter_ps) -rtl_lps_enter (hw); -else -rtl_lps_leave (hw); -} -static void _rtl_pci_init_trx_var (struct ieee80211_hw *hw) {struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));
@@ -1899,7 +1893,7 @@ int rtl_pci_probe(struct pci_dev *pdev, rtlpriv->rtlhal.interface =INTF_PCI ; rtlpriv->cfg = (struct rtl_hal_cfg *)(id->driver_data); rtlpriv->intf_ops = &rtl_pci_ops; - rtlpriv->glb_var = &global_var; + rtlpriv->glb_var = &rtl_global_var;/* *init dbgp flags before all
drivers/net/wireless/rtlwifi/ps.c +16 -0
@@ -269,6 +269,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)spin_unlock_irqrestore (&rtlpriv->locks.ips_lock, flags); } +EXPORT_SYMBOL_GPL (rtl_ips_nic_on);/*for FW LPS*/
@@ -518,6 +519,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed); } } +EXPORT_SYMBOL_GPL (rtl_swlps_beacon);void rtl_swlps_rf_awake (struct ieee80211_hw *hw) {
@@ -611,6 +613,19 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw) MSECS(sleep_intv * mac->vif->bss_conf.beacon_int - 40)); } +void rtl_lps_change_work_callback (struct work_struct *work) +{ +struct rtl_works *rtlworks = + container_of(work, struct rtl_works, lps_change_work); +struct ieee80211_hw *hw = rtlworks->hw; +struct rtl_priv *rtlpriv =rtl_priv (hw); + +if (rtlpriv->enter_ps) +rtl_lps_enter (hw); +else +rtl_lps_leave (hw); +} +EXPORT_SYMBOL_GPL (rtl_lps_change_work_callback);void rtl_swlps_wq_callback (void *data) {
@@ -922,3 +937,4 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len)else rtl_p2p_noa_ie (hw, data, len -FCS_LEN ); } +EXPORT_SYMBOL_GPL (rtl_p2p_info);
drivers/net/wireless/rtlwifi/ps.h +1 -0
@@ -49,5 +49,6 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw);void rtl_swlps_rf_sleep (struct ieee80211_hw *hw);void rtl_p2p_ps_cmd (struct ieee80211_hw *hw,u8 p2p_ps_state);void rtl_p2p_info (struct ieee80211_hw *hw,void *data,unsigned int len); +void rtl_lps_change_work_callback (struct work_struct *work);#endif
drivers/net/wireless/rtlwifi/usb.c +9 -0
@@ -32,6 +32,13 @@#include "ps.h" #include "rtl8192c/fw_common.h" #include <linux/export.h> +#include <linux/module.h> + +MODULE_AUTHOR ("lizhaoming <[email protected]>" ); +MODULE_AUTHOR ("Realtek WlanFAE <[email protected]>" ); +MODULE_AUTHOR ("Larry Finger <[email protected]>" ); +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("USB basic driver for rtlwifi" );#define REALTEK_USB_VENQT_READ 0xC0#define REALTEK_USB_VENQT_WRITE 0x40
@@ -1070,6 +1077,8 @@ int rtl_usb_probe(struct usb_interface *intf,spin_lock_init (&rtlpriv->locks.usb_lock);INIT_WORK (&rtlpriv->works.fill_h2c_cmd, rtl_fill_h2c_cmd_work_callback); +INIT_WORK (&rtlpriv->works.lps_change_work, + rtl_lps_change_work_callback); rtlpriv->usb_data_index =0 ;init_completion (&rtlpriv->firmware_loading_complete);
include/linux/mod_devicetable.h +3 -2
@@ -361,7 +361,8 @@ struct ssb_device_id {__u16 vendor;__u16 coreid;__u8 revision; -}; +__u8 __pad; +} __attribute__((packed, aligned(2)));#define SSB_DEVICE (_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, }#define SSB_DEVTABLE_END \
@@ -377,7 +378,7 @@ struct bcma_device_id {__u16 id;__u8 rev;__u8 class; -}; +} __attribute__((packed,aligned(2)));#define BCMA_CORE (_manuf, _id, _rev, _class) \ { .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, }#define BCMA_CORETABLE_END \
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, 19 Jul 2013 13:19:10 -0400
Quoted 1 line
Please accept this batch of fixes intended for the 3.11 tree...
Pulled, thanks John.