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

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

Merge tag 'wireless-drivers-next-for-davem-2017-04-27' of... 

Merge tag 'wireless-drivers-next-for-davem-2017-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.12

Few remaining patches for 4.12 submitted during the last week.

Major changes:

iwlwifi

* the firmware for 7265D and 3168 NICs is frozen at version 29

* more support for the upcoming A000 series
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 899dc833 47d272f0

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

+8 −15
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
	int ret;

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_pub *drvr = ifp->drvr;

	struct ethhdr *eh = (struct ethhdr *)(skb->data);

	struct ethhdr *eh;



	brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
@@ -210,23 +210,14 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
		goto done;

	}



	/* Make sure there's enough room for any header */

	if (skb_headroom(skb) < drvr->hdrlen) {

		struct sk_buff *skb2;



		brcmf_dbg(INFO, "%s: insufficient headroom\n",

	/* Make sure there's enough writable headroom*/

	ret = skb_cow_head(skb, drvr->hdrlen);

	if (ret < 0) {

		brcmf_err("%s: skb_cow_head failed\n",

			  brcmf_ifname(ifp));

		drvr->bus_if->tx_realloc++;

		skb2 = skb_realloc_headroom(skb, drvr->hdrlen);

		dev_kfree_skb(skb);

		skb = skb2;

		if (skb == NULL) {

			brcmf_err("%s: skb_realloc_headroom failed\n",

				  brcmf_ifname(ifp));

			ret = -ENOMEM;

		goto done;

	}

	}



	/* validate length for ether packet */

	if (skb->len < sizeof(*eh)) {
@@ -235,6 +226,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
		goto done;

	}



	eh = (struct ethhdr *)(skb->data);



	if (eh->h_proto == htons(ETH_P_PAE))

		atomic_inc(&ifp->pend_8021x_cnt);

drivers/net/wireless/intel/iwlwifi/dvm/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv) 
		goto done;

	}

	IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

	iwl_trans_wait_tx_queues_empty(priv->trans, 0xffffffff);

done:

	ieee80211_wake_queues(priv->hw);

	mutex_unlock(&priv->mutex);

drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	}



	IWL_DEBUG_TX_QUEUES(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans, scd_queues);

	iwl_trans_wait_tx_queues_empty(priv->trans, scd_queues);

done:

	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");

drivers/net/wireless/intel/iwlwifi/iwl-7000.c

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	17

#define IWL7265_UCODE_API_MAX	17

#define IWL7265D_UCODE_API_MAX	30

#define IWL3168_UCODE_API_MAX	30

#define IWL7265D_UCODE_API_MAX	29

#define IWL3168_UCODE_API_MAX	29



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	17

drivers/net/wireless/intel/iwlwifi/iwl-a000.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 


static const struct iwl_base_params iwl_a000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_A000,

	.num_of_queues = 31,

	.num_of_queues = 512,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,