Commit 3a06ee33 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-next-2019-11-22' of... 

Merge tag 'wireless-drivers-next-2019-11-22' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.5

Last set of patches for v5.5. Major features here 802.11ax support for
qtnfmac and airtime fairness support to mt76. And naturally smaller
fixes and improvements all over.

Major changes:

qtnfmac

* add 802.11ax support in AP mode

* enable offload bridging support

iwlwifi

* support TX/RX antennas reporting

mt76

* mt7615 smart carrier sense support

* aggregation statistics via debugfs

* airtime fairness (ATF) support

* mt76x0 OF mac address support
====================

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parents 72a2707a 05d6c8cf

drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c

+1 −5
Original line number Diff line number Diff line
@@ -778,7 +778,6 @@ static int brcmf_chip_dmp_get_regaddr(struct brcmf_chip_priv *ci, u32 *eromaddr, 
{

	u8 desc;

	u32 val, szdesc;

	u8 mpnum = 0;

	u8 stype, sztype, wraptype;



	*regbase = 0;
@@ -786,7 +785,6 @@ static int brcmf_chip_dmp_get_regaddr(struct brcmf_chip_priv *ci, u32 *eromaddr, 


	val = brcmf_chip_dmp_get_desc(ci, eromaddr, &desc);

	if (desc == DMP_DESC_MASTER_PORT) {

		mpnum = (val & DMP_MASTER_PORT_NUM) >> DMP_MASTER_PORT_NUM_S;

		wraptype = DMP_SLAVE_TYPE_MWRAP;

	} else if (desc == DMP_DESC_ADDRESS) {

		/* revert erom address */
@@ -854,7 +852,7 @@ int brcmf_chip_dmp_erom_scan(struct brcmf_chip_priv *ci) 
	u8 desc_type = 0;

	u32 val;

	u16 id;

	u8 nmp, nsp, nmw, nsw, rev;

	u8 nmw, nsw, rev;

	u32 base, wrap;

	int err;
@@ -880,8 +878,6 @@ int brcmf_chip_dmp_erom_scan(struct brcmf_chip_priv *ci) 
			return -EFAULT;



		/* only look at cores with master port(s) */

		nmp = (val & DMP_COMP_NUM_MPORT) >> DMP_COMP_NUM_MPORT_S;

		nsp = (val & DMP_COMP_NUM_SPORT) >> DMP_COMP_NUM_SPORT_S;

		nmw = (val & DMP_COMP_NUM_MWRAP) >> DMP_COMP_NUM_MWRAP_S;

		nsw = (val & DMP_COMP_NUM_SWRAP) >> DMP_COMP_NUM_SWRAP_S;

		rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+5 −0
Original line number Diff line number Diff line
@@ -1350,6 +1350,11 @@ void brcmf_detach(struct device *dev) 
	brcmf_fweh_detach(drvr);

	brcmf_proto_detach(drvr);



	if (drvr->mon_if) {

		brcmf_net_detach(drvr->mon_if->ndev, false);

		drvr->mon_if = NULL;

	}



	/* make sure primary interface removed last */

	for (i = BRCMF_MAX_IFS - 1; i > -1; i--) {

		if (drvr->iflist[i])

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

+2 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,8 @@ static int brcmf_pcie_reset(struct device *dev) 
	struct brcmf_fw_request *fwreq;

	int err;



	brcmf_pcie_intr_disable(devinfo);



	brcmf_pcie_bus_console_read(devinfo, true);



	brcmf_detach(dev);

drivers/net/wireless/intel/ipw2x00/ipw2100.c

+1 −2
Original line number Diff line number Diff line
@@ -5565,7 +5565,7 @@ static void shim__set_security(struct net_device *dev, 
			       struct libipw_security *sec)

{

	struct ipw2100_priv *priv = libipw_priv(dev);

	int i, force_update = 0;

	int i;



	mutex_lock(&priv->action_mutex);

	if (!(priv->status & STATUS_INITIALIZED))
@@ -5605,7 +5605,6 @@ static void shim__set_security(struct net_device *dev, 
		priv->ieee->sec.flags |= SEC_ENABLED;

		priv->ieee->sec.enabled = sec->enabled;

		priv->status |= STATUS_SECURITY_UPDATED;

		force_update = 1;

	}



	if (sec->flags & SEC_ENCRYPT)

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+0 −3
Original line number Diff line number Diff line
@@ -6788,9 +6788,6 @@ static int ipw_wx_set_mlme(struct net_device *dev, 
{

	struct ipw_priv *priv = libipw_priv(dev);

	struct iw_mlme *mlme = (struct iw_mlme *)extra;

	__le16 reason;



	reason = cpu_to_le16(mlme->reason_code);



	switch (mlme->cmd) {

	case IW_MLME_DEAUTH:

CRA Git | Maintained and supported by SUSTech CRA and CCSE