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

Commit 81c41260 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

parents fc99dd08 87141db0

drivers/net/wireless/ath/ath9k/main.c

+6 −3
Original line number Diff line number Diff line
@@ -1000,9 +1000,8 @@ void ath9k_calculate_iter_data(struct ath_softc *sc, 
	struct ath_vif *avp;



	/*

	 * Pick the MAC address of the first interface as the new hardware

	 * MAC address. The hardware will use it together with the BSSID mask

	 * when matching addresses.

	 * The hardware will use primary station addr together with the

	 * BSSID mask when matching addresses.

	 */

	memset(iter_data, 0, sizeof(*iter_data));

	memset(&iter_data->mask, 0xff, ETH_ALEN);
@@ -1232,6 +1231,8 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
		list_add_tail(&avp->list, &avp->chanctx->vifs);

	}



	ath9k_calculate_summary_state(sc, avp->chanctx);



	ath9k_assign_hw_queues(hw, vif);



	an->sc = sc;
@@ -1301,6 +1302,8 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 


	ath_tx_node_cleanup(sc, &avp->mcast_node);



	ath9k_calculate_summary_state(sc, avp->chanctx);



	mutex_unlock(&sc->mutex);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev) 
		return;



	irq = irq_of_parse_and_map(np, 0);

	if (irq < 0) {

		brcmf_err("interrupt could not be mapped: err=%d\n", irq);

	if (!irq) {

		brcmf_err("interrupt could not be mapped\n");

		devm_kfree(dev, sdiodev->pdata);

		return;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
#include <linux/pci.h>

#include <linux/vmalloc.h>

#include <linux/delay.h>

#include <linux/unaligned/access_ok.h>

#include <linux/interrupt.h>

#include <linux/bcma/bcma.h>

#include <linux/sched.h>

#include <asm/unaligned.h>



#include <soc.h>

#include <chipcommon.h>

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

+4 −2
Original line number Diff line number Diff line
@@ -738,10 +738,12 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd, 
		goto finalize;

	}



	if (!brcmf_usb_ioctl_resp_wait(devinfo))

	if (!brcmf_usb_ioctl_resp_wait(devinfo)) {

		usb_kill_urb(devinfo->ctl_urb);

		ret = -ETIMEDOUT;

	else

	} else {

		memcpy(buffer, tmpbuf, buflen);

	}



finalize:

	kfree(tmpbuf);

drivers/net/wireless/rtlwifi/pci.c

+10 −10
Original line number Diff line number Diff line
@@ -2249,6 +2249,16 @@ int rtl_pci_probe(struct pci_dev *pdev, 
	/*like read eeprom and so on */

	rtlpriv->cfg->ops->read_eeprom_info(hw);



	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

	}

	rtlpriv->cfg->ops->init_sw_leds(hw);



	/*aspm */

	rtl_pci_init_aspm(hw);



	/* Init mac80211 sw */

	err = rtl_init_core(hw);

	if (err) {
@@ -2264,16 +2274,6 @@ int rtl_pci_probe(struct pci_dev *pdev, 
		goto fail3;

	}



	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

	}

	rtlpriv->cfg->ops->init_sw_leds(hw);



	/*aspm */

	rtl_pci_init_aspm(hw);



	err = ieee80211_register_hw(hw);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,