pull request: wireless 2013-05-29
Subsystems (8)
Dave,
Please pull this batch of fixes intended for the 3.10 stream...
Regarding the NFC bits, Samuel says:
"This is the first batch of NFC fixes for 3.10, and it contains:
- 3 fixes for the NFC MEI support:
* We now depend on the correct Kconfig symbol.
* We register an MEI event callback whenever we enable an NFC device, otherwise we fail to read anything after an enable/disable cycle.
* We only disable an MEI device from its disable mey_phy_ops, preventing useless consecutive disable calls.
- An NFC Makefile cleanup, as I forgot to remove a commented out line when moving the LLCP code to the NFC top level directory."
As for the mac80211 bits, Johannes says:
"This time I have a fix from Stanislaw for a stupid mistake I made in the auth/assoc timeout changes, a fix from Felix for 64-bit traffic counters and one from Helmut for address mask handling in mac80211. I also have a few fixes myself for four different crashes reported by a few people."
And Johannes says this about the iwlwifi bit:
"This fixes a brown paper-bag bug that we really should've caught in review. More details in the changelog for the fix."
On top of that...
Arend van Spriel and Hante Meuleman cooperate to send a series of AP and P2P mode fixes for brcmfmac.
Gabor Juhos corrects a register offset for AR9550, avoiding a bus error.
Dan Carpenter provides a fixup to some dmesg output in the atmel driver.
And, finally...
Felix Fietkau not only gives us a trio of small AR934x fixes, but also refactors the ath9k aggregation session start/stop handling (using the generic mac80211 support) in order to avoid a deadlock.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 8e6d91ae0917bf934ed86411148f79d904728d51:
tuntap: forbid changing mq flag for persistent device (2013-05-29 00:21:32 -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 50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-05-29 10:59:35 -0400)
----------------------------------------------------------------
Arend van Spriel (3):
brcmfmac: add additional parameter to brcmf_free_vif()
brcmfmac: free net device when registration fails
brcmfmac: use struct net_device::destructor to remove interfaces
Dan Carpenter (1):
atmel: printing bogus information
Emmanuel Grumbach (1):
iwlwifi: dvm: fix zero LQ CMD sending avoidance
Felix Fietkau (5):
ath9k: prevent aggregation session deadlocks
cfg80211: fix reporting 64-bit station info tx bytes
ath9k_hw: fix spur mitigation issues on AR934x
ath9k_hw: fix host interface reset on AR934x
ath9k_hw: improve performance for AR934x v1.3+
Gabor Juhos (1):
ath9k: use correct OTP register offsets for AR9550
Hante Meuleman (4):
brcmfmac: Turn off ARP offloading when configured for AP.
brcmfmac: Fix p2p setup when connected to ap on 5G.
brcmfmac: Add multi channel support for P2P.
brcmfmac: Disable powersave mode for P2P link.
Helmut Schaa (1):
mac80211: Allow single vif mac address change with addr_mask
Johannes Berg (4):
cfg80211: check wdev->netdev in connection work
mac80211: fix queue handling crash
mac80211: assign AP_VLAN hw queues correctly
mac80211: close AP_VLAN interfaces before unregistering all
John W. Linville (4):
Samuel Ortiz <[email protected]> says:
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Paul Bolle (1):
NFC: Remove commented out LLCP related Makefile line
Samuel Ortiz (3):
NFC: mei_phy depends on INTEL_MEI
NFC: mei_phy: Register event callback when enabling the device
NFC: mei: Do not disable MEI devices from their remove routine
Stanislaw Gruszka (1):
mac80211: fix direct probe auth
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 9 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 14 +-- drivers/net/wireless/ath/ath9k/hw.c | 25 ++-- drivers/net/wireless/ath/ath9k/mac.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/ath/ath9k/rc.c | 5 +- drivers/net/wireless/ath/ath9k/reg.h | 11 ++ drivers/net/wireless/ath/ath9k/xmit.c | 138 ++++++--------------- drivers/net/wireless/atmel.c | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 18 --- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 16 ++- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 3 +- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 6 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 74 ++++++++--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 89 ++++++++++--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 3 +- drivers/net/wireless/iwlwifi/dvm/sta.c | 2 +- drivers/nfc/Kconfig | 2 +- drivers/nfc/mei_phy.c | 9 ++ drivers/nfc/microread/mei.c | 20 +-- drivers/nfc/pn544/mei.c | 20 +-- net/mac80211/iface.c | 44 +++++-- net/mac80211/mlme.c | 12 +- net/nfc/Makefile | 1 - net/wireless/nl80211.c | 2 +- net/wireless/sme.c | 3 + 27 files changed, 301 insertions(+), 235 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h +6 -3
@@ -68,13 +68,16 @@#define AR9300_BASE_ADDR 0x3ff#define AR9300_BASE_ADDR_512 0x1ff -#define AR9300_OTP_BASE (AR_SREV_9340(ah) ? 0x30000 : 0x14000) -#define AR9300_OTP_STATUS (AR_SREV_9340(ah) ? 0x30018 : 0x15f18) +#define AR9300_OTP_BASE \ + ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000) +#define AR9300_OTP_STATUS \ + ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30018 : 0x15f18)#define AR9300_OTP_STATUS_TYPE 0x7#define AR9300_OTP_STATUS_VALID 0x4#define AR9300_OTP_STATUS_ACCESS_BUSY 0x2#define AR9300_OTP_STATUS_SM_BUSY 0x1 -#define AR9300_OTP_READ_DATA (AR_SREV_9340(ah) ? 0x3001c : 0x15f1c) +#define AR9300_OTP_READ_DATA \ + ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c)enum targetPowerHTRates {HT_TARGET_RATE_0_8_16 ,
drivers/net/wireless/ath/ath9k/ar9003_phy.c +2 -1
@@ -334,7 +334,8 @@ static void ar9003_hw_spur_ofdm(struct ath_hw *ah,REG_RMW_FIELD (ah,AR_PHY_SPUR_REG ,AR_PHY_SPUR_REG_EN_VIT_SPUR_RSSI ,1 ); -if (REG_READ_FIELD (ah,AR_PHY_MODE , +if (!AR_SREV_9340 (ah) && +REG_READ_FIELD (ah,AR_PHY_MODE ,AR_PHY_MODE_DYNAMIC ) ==0x1 )REG_RMW_FIELD (ah,AR_PHY_SPUR_REG ,AR_PHY_SPUR_REG_ENABLE_NF_RSSI_SPUR_MIT ,1 );
drivers/net/wireless/ath/ath9k/ath9k.h +4 -10
@@ -251,10 +251,9 @@ struct ath_atx_tid {int tidno;int baw_head;/* first un-acked tx buffer */ int baw_tail;/* next unused tx buffer slot */ -int sched; -int paused; -u8 state; -bool stop_cb; +bool sched; +bool paused; +bool active; };struct ath_node {
@@ -275,10 +274,6 @@ struct ath_node {#endif }; -#define AGGR_CLEANUP BIT(1) -#define AGGR_ADDBA_COMPLETE BIT(2) -#define AGGR_ADDBA_PROGRESS BIT(3) -struct ath_tx_control {struct ath_txq *txq;struct ath_node *an;
@@ -352,8 +347,7 @@ void ath_tx_tasklet(struct ath_softc *sc);void ath_tx_edma_tasklet (struct ath_softc *sc);int ath_tx_aggr_start (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid,u16 *ssn); -bool ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid, -bool flush); +void ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_resume (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_wakeup (struct ath_softc *sc,struct ath_node *an);
drivers/net/wireless/ath/ath9k/hw.c +17 -8
@@ -1172,6 +1172,7 @@ u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan)static inline void ath9k_hw_set_dma (struct ath_hw *ah) {struct ath_common *common =ath9k_hw_common (ah); +int txbuf_size;ENABLE_REGWRITE_BUFFER (ah);
@@ -1225,13 +1226,17 @@ static inline void ath9k_hw_set_dma(struct ath_hw *ah)* So set the usable tx buf size also to half to * avoid data/delimiter underruns */ -REG_WRITE (ah,AR_PCU_TXBUF_CTRL , -AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE ); - }else if (!AR_SREV_9271 (ah)) { -REG_WRITE (ah,AR_PCU_TXBUF_CTRL , -AR_PCU_TXBUF_CTRL_USABLE_SIZE ); + txbuf_size =AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE ; + }else if (AR_SREV_9340_13_OR_LATER (ah)) { +/* Uses fewer entries for AR934x v1.3+ to prevent rx overruns */ + txbuf_size =AR_9340_PCU_TXBUF_CTRL_USABLE_SIZE ; + }else { + txbuf_size =AR_PCU_TXBUF_CTRL_USABLE_SIZE ; } +if (!AR_SREV_9271 (ah)) +REG_WRITE (ah,AR_PCU_TXBUF_CTRL , txbuf_size); +REGWRITE_BUFFER_FLUSH (ah);if (AR_SREV_9300_20_OR_LATER (ah))
@@ -1306,9 +1311,13 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)AR_RTC_RC_COLD_RESET |AR_RTC_RC_WARM_RESET ; }else { tmpReg =REG_READ (ah,AR_INTR_SYNC_CAUSE ); -if (tmpReg & - (AR_INTR_SYNC_LOCAL_TIMEOUT | -AR_INTR_SYNC_RADM_CPL_TIMEOUT )) { +if (AR_SREV_9340 (ah)) + tmpReg &=AR9340_INTR_SYNC_LOCAL_TIMEOUT ; +else + tmpReg &=AR_INTR_SYNC_LOCAL_TIMEOUT | +AR_INTR_SYNC_RADM_CPL_TIMEOUT ; + +if (tmpReg) {u32 val;REG_WRITE (ah,AR_INTR_SYNC_ENABLE ,0 );
drivers/net/wireless/ath/ath9k/mac.c +1 -1
@@ -410,7 +410,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)REG_WRITE (ah,AR_QMISC (q),AR_Q_MISC_DCU_EARLY_TERM_REQ ); -if (AR_SREV_9340 (ah)) +if (AR_SREV_9340 (ah) && !AR_SREV_9340_13_OR_LATER (ah))REG_WRITE (ah,AR_DMISC (q),AR_D_MISC_CW_BKOFF_EN |AR_D_MISC_FRAG_WAIT_EN |0x1 );else
drivers/net/wireless/ath/ath9k/main.c +2 -1
@@ -1709,7 +1709,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, flush = true;case IEEE80211_AMPDU_TX_STOP_CONT :ath9k_ps_wakeup (sc); -if (ath_tx_aggr_stop (sc, sta, tid, flush)) +ath_tx_aggr_stop (sc, sta, tid); +if (!flush)ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);ath9k_ps_restore (sc);break ;
drivers/net/wireless/ath/ath9k/rc.c +1 -4
@@ -1227,10 +1227,7 @@ static bool ath_tx_aggr_check(struct ath_softc *sc, struct ieee80211_sta *sta,return false; txtid =ATH_AN_2_TID (an, tidno); - -if (!(txtid->state & (AGGR_ADDBA_COMPLETE |AGGR_ADDBA_PROGRESS ))) -return true; -return false; +return !txtid->active; }
drivers/net/wireless/ath/ath9k/reg.h +11 -0
@@ -798,6 +798,10 @@#define AR_SREV_REVISION_9485_10 0#define AR_SREV_REVISION_9485_11 1#define AR_SREV_VERSION_9340 0x300 +#define AR_SREV_REVISION_9340_10 0 +#define AR_SREV_REVISION_9340_11 1 +#define AR_SREV_REVISION_9340_12 2 +#define AR_SREV_REVISION_9340_13 3#define AR_SREV_VERSION_9580 0x1C0#define AR_SREV_REVISION_9580_10 4/* AR9580 1.0 */ #define AR_SREV_VERSION_9462 0x280
@@ -897,6 +901,10 @@#define AR_SREV_9340 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9340)) +#define AR_SREV_9340_13_OR_LATER (_ah) \ + (AR_SREV_9340((_ah)) && \ + ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9340_13)) +#define AR_SREV_9285E_20 (_ah) \ (AR_SREV_9285_12_OR_LATER(_ah) && \ ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
@@ -1007,6 +1015,8 @@ enum {AR_INTR_SYNC_LOCAL_TIMEOUT | AR_INTR_SYNC_MAC_SLEEP_ACCESS), +AR9340_INTR_SYNC_LOCAL_TIMEOUT =0x00000010 , + AR_INTR_SYNC_SPURIOUS = 0xFFFFFFFF, };
@@ -1881,6 +1891,7 @@ enum {#define AR_PCU_TXBUF_CTRL_SIZE_MASK 0x7FF#define AR_PCU_TXBUF_CTRL_USABLE_SIZE 0x700#define AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE 0x380 +#define AR_9340_PCU_TXBUF_CTRL_USABLE_SIZE 0x500#define AR_PCU_MISC_MODE2 0x8344#define AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE 0x00000002
drivers/net/wireless/ath/ath9k/xmit.c +39 -99
242 lines not on this page · raw message
drivers/net/wireless/atmel.c +1 -1
@@ -1624,7 +1624,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,netif_carrier_off (dev); -if (!proc_create_data ("driver/atmel" ,0 ,NULL , &atmel_proc_fops, priv)); +if (!proc_create_data ("driver/atmel" ,0 ,NULL , &atmel_proc_fops, priv))printk (KERN_WARNING "atmel: unable to create /proc entry.\n" ); printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %pM\n",
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +0 -18
@@ -27,7 +27,6 @@#include "tracepoint.h" #define PKTFILTER_BUF_SIZE 128 -#define BRCMF_ARPOL_MODE 0xb/* agent|snoop|peer_autoreply */ #define BRCMF_DEFAULT_BCN_TIMEOUT 3#define BRCMF_DEFAULT_SCAN_CHANNEL_TIME 40#define BRCMF_DEFAULT_SCAN_UNASSOC_TIME 40
@@ -338,23 +337,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) goto done; } -/* Try to set and enable ARP offload feature, this may fail */ - err =brcmf_fil_iovar_int_set (ifp,"arp_ol" ,BRCMF_ARPOL_MODE ); -if (err) { -brcmf_dbg (TRACE ,"failed to set ARP offload mode to 0x%x, err = %d\n" , -BRCMF_ARPOL_MODE , err); - err =0 ; - }else { - err =brcmf_fil_iovar_int_set (ifp,"arpoe" ,1 ); -if (err) { -brcmf_dbg (TRACE ,"failed to enable ARP offload err = %d\n" , - err); - err =0 ; - }else -brcmf_dbg (TRACE ,"successfully enabled ARP offload to 0x%x\n" , -BRCMF_ARPOL_MODE ); - } -/* Setup packet filter */ brcmf_c_pktfilter_offload_set (ifp,BRCMF_DEFAULT_PACKET_FILTER ); brcmf_c_pktfilter_offload_enable(ifp, BRCMF_DEFAULT_PACKET_FILTER,
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +10 -6
@@ -653,10 +653,13 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)brcmf_dbg (INFO ,"%s: Broadcom Dongle Host Driver\n" , ndev->name); + ndev->destructor = free_netdev;return 0 ; fail: + drvr->iflist[ifp->bssidx] =NULL ; ndev->netdev_ops =NULL ; +free_netdev (ndev);return -EBADE ; }
@@ -720,6 +723,9 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp)return 0 ; fail: + ifp->drvr->iflist[ifp->bssidx] =NULL ; + ndev->netdev_ops =NULL ; +free_netdev (ndev);return -EBADE ; }
@@ -788,6 +794,7 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx)struct brcmf_if *ifp; ifp = drvr->iflist[bssidx]; + drvr->iflist[bssidx] =NULL ;if (!ifp) {brcmf_err ("Null interface, idx=%d\n" , bssidx);return ;
@@ -808,15 +815,13 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx)cancel_work_sync (&ifp->setmacaddr_work);cancel_work_sync (&ifp->multicast_work); } - +/* unregister will take care of freeing it */ unregister_netdev (ifp->ndev);if (bssidx ==0 )brcmf_cfg80211_detach (drvr->config); -free_netdev (ifp->ndev); }else {kfree (ifp); } - drvr->iflist[bssidx] =NULL ; }int brcmf_attach (uint bus_hdrlen,struct device *dev)
@@ -925,8 +930,6 @@ fail:brcmf_fws_del_interface (ifp);brcmf_fws_deinit (drvr); } -free_netdev (ifp->ndev); - drvr->iflist[0 ] =NULL ;if (p2p_ifp) {free_netdev (p2p_ifp->ndev); drvr->iflist[1 ] =NULL ;
@@ -934,7 +937,8 @@ fail:return ret; }if ((brcmf_p2p_enable) && (p2p_ifp)) -brcmf_net_p2p_attach (p2p_ifp); +if (brcmf_net_p2p_attach (p2p_ifp) <0 ) + brcmf_p2p_enable =0 ;return 0 ; }
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +2 -1
@@ -202,7 +202,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,return ;brcmf_fws_add_interface (ifp);if (!drvr->fweh.evt_handler[BRCMF_E_IF ]) - err =brcmf_net_attach (ifp, false); +if (brcmf_net_attach (ifp, false) <0 ) +return ; }if (ifevent->action ==BRCMF_E_IF_CHANGE )
drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +6 -0
@@ -23,6 +23,12 @@#define BRCMF_FIL_ACTION_FRAME_SIZE 1800 +/* ARP Offload feature flags for arp_ol iovar */ +#define BRCMF_ARP_OL_AGENT 0x00000001 +#define BRCMF_ARP_OL_SNOOP 0x00000002 +#define BRCMF_ARP_OL_HOST_AUTO_REPLY 0x00000004 +#define BRCMF_ARP_OL_PEER_AUTO_REPLY 0x00000008 +enum brcmf_fil_p2p_if_types {BRCMF_FIL_P2P_IF_CLIENT ,
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +54 -20
152 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +75 -14
178 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +2 -1
@@ -487,7 +487,8 @@ enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);struct brcmf_cfg80211_vif *brcmf_alloc_vif (struct brcmf_cfg80211_info *cfg,enum nl80211_iftype type,bool pm_block); -void brcmf_free_vif (struct brcmf_cfg80211_vif *vif); +void brcmf_free_vif (struct brcmf_cfg80211_info *cfg, +struct brcmf_cfg80211_vif *vif);s32 brcmf_vif_set_mgmt_ie (struct brcmf_cfg80211_vif *vif,s32 pktflag,const u8 *vndr_ie_buf,u32 vndr_ie_len);
drivers/net/wireless/iwlwifi/dvm/sta.c +1 -1
@@ -735,7 +735,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)memcpy (&lq, priv->stations[i].lq,sizeof (struct iwl_link_quality_cmd )); -if (!memcmp (&lq, &zero_lq,sizeof (lq))) +if (memcmp (&lq, &zero_lq,sizeof (lq))) send_lq = true; }spin_unlock_bh (&priv->sta_lock);
drivers/nfc/Kconfig +1 -1
@@ -28,7 +28,7 @@ config NFC_WILINK config NFC_MEI_PHY tristate "MEI bus NFC device support" - depends on INTEL_MEI_BUS_NFC && NFC_HCI + depends on INTEL_MEI && NFC_HCI help This adds support to use an mei bus nfc device. Select this if you will use an HCI NFC driver for an NFC chip connected behind an
drivers/nfc/mei_phy.c +9 -0
@@ -64,6 +64,15 @@ int nfc_mei_phy_enable(void *phy_id)return r; } + r =mei_cl_register_event_cb (phy->device, nfc_mei_event_cb, phy); +if (r) { +pr_err ("MEY_PHY: Event cb registration failed\n" ); +mei_cl_disable_device (phy->device); + phy->powered =0 ; + +return r; + } + phy->powered =1 ;return 0 ;
drivers/nfc/microread/mei.c +5 -15
@@ -43,24 +43,16 @@ static int microread_mei_probe(struct mei_cl_device *device,return -ENOMEM ; } - r =mei_cl_register_event_cb (device, nfc_mei_event_cb, phy); -if (r) { -pr_err (MICROREAD_DRIVER_NAME ": event cb registration failed\n" ); - goto err_out; - } - r =microread_probe (phy, &mei_phy_ops,LLC_NOP_NAME ,MEI_NFC_HEADER_SIZE ,0 ,MEI_NFC_MAX_HCI_PAYLOAD , &phy->hdev); -if (r <0 ) - goto err_out; - -return 0 ; +if (r <0 ) { +nfc_mei_phy_free (phy); -err_out: -nfc_mei_phy_free (phy); +return r; + } -return r; +return 0 ; }static int microread_mei_remove (struct mei_cl_device *device)
@@ -71,8 +63,6 @@ static int microread_mei_remove(struct mei_cl_device *device)microread_remove (phy->hdev); -nfc_mei_phy_disable (phy); -nfc_mei_phy_free (phy);return 0 ;
drivers/nfc/pn544/mei.c +5 -15
@@ -43,24 +43,16 @@ static int pn544_mei_probe(struct mei_cl_device *device,return -ENOMEM ; } - r =mei_cl_register_event_cb (device, nfc_mei_event_cb, phy); -if (r) { -pr_err (PN544_DRIVER_NAME ": event cb registration failed\n" ); - goto err_out; - } - r =pn544_hci_probe (phy, &mei_phy_ops,LLC_NOP_NAME ,MEI_NFC_HEADER_SIZE ,0 ,MEI_NFC_MAX_HCI_PAYLOAD , &phy->hdev); -if (r <0 ) - goto err_out; - -return 0 ; +if (r <0 ) { +nfc_mei_phy_free (phy); -err_out: -nfc_mei_phy_free (phy); +return r; + } -return r; +return 0 ; }static int pn544_mei_remove (struct mei_cl_device *device)
@@ -71,8 +63,6 @@ static int pn544_mei_remove(struct mei_cl_device *device)pn544_hci_remove (phy->hdev); -nfc_mei_phy_disable (phy); -nfc_mei_phy_free (phy);return 0 ;
net/mac80211/iface.c +37 -7
90 lines not on this page · raw message
net/mac80211/mlme.c +6 -6
@@ -3321,10 +3321,6 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)if (WARN_ON_ONCE (!auth_data))return -EINVAL ; -if (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) - tx_flags =IEEE80211_TX_CTL_REQ_TX_STATUS | -IEEE80211_TX_INTFL_MLME_CONN_TX ; - auth_data->tries++;if (auth_data->tries >IEEE80211_AUTH_MAX_TRIES ) {
@@ -3358,6 +3354,10 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) auth_data->expected_transaction = trans; } +if (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) + tx_flags =IEEE80211_TX_CTL_REQ_TX_STATUS | +IEEE80211_TX_INTFL_MLME_CONN_TX ; + ieee80211_send_auth(sdata, trans, auth_data->algorithm, status, auth_data->data, auth_data->data_len, auth_data->bss->bssid,
@@ -3381,12 +3381,12 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)* will not answer to direct packet in unassociated state. */ ieee80211_send_probe_req (sdata,NULL , ssidie +2 , ssidie[1 ], -NULL ,0 , (u32) -1 , true, tx_flags, +NULL ,0 , (u32) -1 , true,0 , auth_data->bss->channel, false);rcu_read_unlock (); } -if (!(local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS )) { +if (tx_flags ==0 ) { auth_data->timeout = jiffies +IEEE80211_AUTH_TIMEOUT ; ifmgd->auth_data->timeout_started = true;run_again (ifmgd, auth_data->timeout);
net/nfc/Makefile +0 -1
@@ -5,7 +5,6 @@ obj-$(CONFIG_NFC) += nfc.o obj-$(CONFIG_NFC_NCI) += nci/ obj-$(CONFIG_NFC_HCI) += hci/ -#obj-$(CONFIG_NFC_LLCP) += llcp/ nfc-objs := core.o netlink.o af_nfc.o rawsock.o llcp_core.o llcp_commands.o \ llcp_sock.o
net/wireless/nl80211.c +1 -1
@@ -3411,7 +3411,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 portid, u32 seq, (u32)sinfo->rx_bytes)) goto nla_put_failure;if ((sinfo->filled & (STATION_INFO_TX_BYTES | -NL80211_STA_INFO_TX_BYTES64 )) && +STATION_INFO_TX_BYTES64 )) &&nla_put_u32 (msg,NL80211_STA_INFO_TX_BYTES , (u32 )sinfo->tx_bytes)) goto nla_put_failure;
net/wireless/sme.c +3 -0
@@ -231,6 +231,9 @@ void cfg80211_conn_work(struct work_struct *work)mutex_lock (&rdev->sched_scan_mtx);list_for_each_entry (wdev, &rdev->wdev_list, list) { +if (!wdev->netdev) +continue ; +wdev_lock (wdev);if (!netif_running (wdev->netdev)) {wdev_unlock (wdev);
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: Wed, 29 May 2013 11:28:53 -0400
Quoted 1 line
Please pull this batch of fixes intended for the 3.10 stream...
Pulled, thanks John.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html