Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b63a2a1f authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2014-12-26' of... 

Merge tag 'wireless-drivers-for-davem-2014-12-26' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



o Paul made a Kconfig dependency fix to ipw2200, it was not possible to
  enable that driver because Wireless Extensions is now disabled by default.

o Mika fixed brcmfmac not to crash when platform data is not populated

o Emmanuel provided few fixes to iwlwifi, he says:

  "I have here new device IDs and a fix for double free bug I
  introduced. I also fix an issue with the RFKILL interrupt - the HW
  needs us to ACK the interrupt again after we reset it. Liad fixes an
  issue with the firmware debugging infrastructure. While working on
  torture scenarios of firmware restarts, Eliad found an issue which
  he fixed."

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5f35227e 8975842b

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	 */

	if ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_KEEP_POWER) &&

	    ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_WAKE_SDIO_IRQ) ||

	     (sdiodev->pdata->oob_irq_supported)))

	     (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)))

		bus_if->wowl_supported = true;

#endif
@@ -1167,7 +1167,7 @@ static int brcmf_ops_sdio_resume(struct device *dev) 
	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;



	brcmf_dbg(SDIO, "Enter\n");

	if (sdiodev->pdata->oob_irq_supported)

	if (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)

		disable_irq_wake(sdiodev->pdata->oob_irq_nr);

	brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS);

	atomic_set(&sdiodev->suspend, false);

drivers/net/wireless/ipw2x00/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ config IPW2100_DEBUG 


config IPW2200

	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"

	depends on PCI && CFG80211 && CFG80211_WEXT

	depends on PCI && CFG80211

	select CFG80211_WEXT

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

drivers/net/wireless/iwlwifi/iwl-drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1323,10 +1323,10 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 


 try_again:

	/* try next, if any */

	kfree(pieces);

	release_firmware(ucode_raw);

	if (iwl_request_firmware(drv, false))

		goto out_unbind;

	kfree(pieces);

	return;



 out_free_fw:

drivers/net/wireless/iwlwifi/iwl-fh.h

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl) 
#define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE	(0x01000000)



#define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT	28

#define FH_MEM_TB_MAX_LENGTH			(0x00020000)



/* TFDB  Area - TFDs buffer table */

#define FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK      (0xFFFFFFFF)

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+13 −2
Original line number Diff line number Diff line
@@ -1004,7 +1004,12 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) 
{

	lockdep_assert_held(&mvm->mutex);



	/* disallow low power states when the FW is down */

	/*

	 * Disallow low power states when the FW is down by taking

	 * the UCODE_DOWN ref. in case of ongoing hw restart the

	 * ref is already taken, so don't take it again.

	 */

	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))

		iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);



	/* async_handlers_wk is now blocked */
@@ -1023,6 +1028,12 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) 
	/* the fw is stopped, the aux sta is dead: clean up driver state */

	iwl_mvm_del_aux_sta(mvm);



	/*

	 * Clear IN_HW_RESTART flag when stopping the hw (as restart_complete()

	 * won't be called in this case).

	 */

	clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);



	mvm->ucode_loaded = false;

}