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

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

Merge tag 'wireless-drivers-for-davem-2018-03-08' of... 

Merge tag 'wireless-drivers-for-davem-2018-03-08' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo:

====================
wireless-drivers fixes for 4.16

Quote a few fixes as I have not been able to send a pull request
earlier. Most of the fixes for iwlwifi but also few others, nothing
really standing out though.

iwlwifi

* fix a bogus warning when freeing a TFD

* fix severe throughput problem with 9000 series

* fix for a bug that caused queue hangs in certain situations

* fix for an issue with IBSS

* fix an issue with rate-scaling in AP-mode

* fix Channel Switch Announcement (CSA) issues with count 0 and 1

* some firmware debugging fixes

* remov a wrong error message when removing keys

* fix a firmware sysassert most usually triggered in IBSS

* a couple of fixes on multicast queues

* a fix with CCMP 256

rtlwifi

* fix loss of signal for rtl8723be

brcmfmac

* add possibility to obtain firmware error

* fix P2P_DEVICE ethernet address generation
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3d07e074 455f3e76

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

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ enum brcmf_netif_stop_reason { 
 * @netif_stop_lock: spinlock for update netif_stop from multiple sources.

 * @pend_8021x_cnt: tracks outstanding number of 802.1x frames.

 * @pend_8021x_wait: used for signalling change in count.

 * @fwil_fwerr: flag indicating fwil layer should return firmware error codes.

 */

struct brcmf_if {

	struct brcmf_pub *drvr;
@@ -198,6 +199,7 @@ struct brcmf_if { 
	wait_queue_head_t pend_8021x_wait;

	struct in6_addr ipv6_addr_tbl[NDOL_MAX_ENTRIES];

	u8 ipv6addr_idx;

	bool fwil_fwerr;

};



int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp);

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

+10 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ static void brcmf_feat_iovar_int_get(struct brcmf_if *ifp, 
	u32 data;

	int err;



	/* we need to know firmware error */

	ifp->fwil_fwerr = true;



	err = brcmf_fil_iovar_int_get(ifp, name, &data);

	if (err == 0) {

		brcmf_dbg(INFO, "enabling feature: %s\n", brcmf_feat_names[id]);
@@ -112,6 +115,8 @@ static void brcmf_feat_iovar_int_get(struct brcmf_if *ifp, 
		brcmf_dbg(TRACE, "%s feature check failed: %d\n",

			  brcmf_feat_names[id], err);

	}



	ifp->fwil_fwerr = false;

}



static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp,
@@ -120,6 +125,9 @@ static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp, 
{

	int err;



	/* we need to know firmware error */

	ifp->fwil_fwerr = true;



	err = brcmf_fil_iovar_data_set(ifp, name, data, len);

	if (err != -BRCMF_FW_UNSUPPORTED) {

		brcmf_dbg(INFO, "enabling feature: %s\n", brcmf_feat_names[id]);
@@ -128,6 +136,8 @@ static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp, 
		brcmf_dbg(TRACE, "%s feature check failed: %d\n",

			  brcmf_feat_names[id], err);

	}



	ifp->fwil_fwerr = false;

}



#define MAX_CAPS_BUFFER_SIZE	512

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

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set) 
			  brcmf_fil_get_errstr((u32)(-fwerr)), fwerr);

		err = -EBADE;

	}

	if (ifp->fwil_fwerr)

		return fwerr;



	return err;

}

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

+11 −13
Original line number Diff line number Diff line
@@ -462,25 +462,23 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac) 
 * @dev_addr: optional device address.

 *

 * P2P needs mac addresses for P2P device and interface. If no device

 * address it specified, these are derived from the primary net device, ie.

 * the permanent ethernet address of the device.

 * address it specified, these are derived from a random ethernet

 * address.

 */

static void brcmf_p2p_generate_bss_mac(struct brcmf_p2p_info *p2p, u8 *dev_addr)

{

	struct brcmf_if *pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;

	bool local_admin = false;

	bool random_addr = false;



	if (!dev_addr || is_zero_ether_addr(dev_addr)) {

		dev_addr = pri_ifp->mac_addr;

		local_admin = true;

	}

	if (!dev_addr || is_zero_ether_addr(dev_addr))

		random_addr = true;



	/* Generate the P2P Device Address.  This consists of the device's

	 * primary MAC address with the locally administered bit set.

	/* Generate the P2P Device Address obtaining a random ethernet

	 * address with the locally administered bit set.

	 */

	if (random_addr)

		eth_random_addr(p2p->dev_addr);

	else

		memcpy(p2p->dev_addr, dev_addr, ETH_ALEN);

	if (local_admin)

		p2p->dev_addr[0] |= 0x02;



	/* Generate the P2P Interface Address.  If the discovery and connection

	 * BSSCFGs need to simultaneously co-exist, then this address must be

drivers/net/wireless/intel/iwlwifi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ config IWLWIFI_BCAST_FILTERING 
config IWLWIFI_PCIE_RTPM

       bool "Enable runtime power management mode for PCIe devices"

       depends on IWLMVM && PM && EXPERT

       default false

       help

         Say Y here to enable runtime power management for PCIe

         devices.  If enabled, the device will go into low power mode