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

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

Merge tag 'wireless-drivers-for-davem-2017-07-21' of... 

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



Kalle Valo says:

====================
wireless-drivers fixes for 4.13

Important, but small in size, fixes.

brcmfmac

* fix a regression in SDIO support introduced in v4.13-rc1

rtlwifi

* fix a regression in bluetooth coexistance introduced in v4.13-rc1

iwlwifi

* a few NULL pointer dereferences in the recovery flow

* a small but important fix for IBSS

* a one-liner fix for tracing, which was including too much data
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1819ae3d d755cbc2

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

+2 −1
Original line number Diff line number Diff line
@@ -2053,12 +2053,13 @@ static int brcmf_sdio_txpkt_hdalign(struct brcmf_sdio *bus, struct sk_buff *pkt) 
				atomic_inc(&stats->pktcow_failed);

				return -ENOMEM;

			}

			head_pad = 0;

		}

		skb_push(pkt, head_pad);

		dat_buf = (u8 *)(pkt->data);

	}

	memset(dat_buf, 0, head_pad + bus->tx_hdrlen);

	return 0;

	return head_pad;

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -1189,11 +1189,11 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb) 
				next_reclaimed;

			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",

						  next_reclaimed);

			iwlagn_check_ratid_empty(priv, sta_id, tid);

		}



		iwl_trans_reclaim(priv->trans, txq_id, ssn, &skbs);



		iwlagn_check_ratid_empty(priv, sta_id, tid);

		freed = 0;



		/* process frames */

drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ static inline bool iwl_trace_data(struct sk_buff *skb) 
	/* also account for the RFC 1042 header, of course */

	offs += 6;



	return skb->len > offs + 2 &&

	       *(__be16 *)(skb->data + offs) == cpu_to_be16(ETH_P_PAE);

	return skb->len <= offs + 2 ||

		*(__be16 *)(skb->data + offs) != cpu_to_be16(ETH_P_PAE);

}



static inline size_t iwl_rx_trace_len(const struct iwl_trans *trans,

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

+7 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,13 @@ int __iwl_mvm_mac_start(struct iwl_mvm *mvm) 


	lockdep_assert_held(&mvm->mutex);



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

	if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status)) {

		/*

		 * Now convert the HW_RESTART_REQUESTED flag to IN_HW_RESTART

		 * so later code will - from now on - see that we're doing it.

		 */

		set_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);

		clear_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);

		/* Clean up some internal and mac80211 state on restart */

		iwl_mvm_restart_cleanup(mvm);

	} else {

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+2 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,7 @@ struct iwl_mvm { 
 * @IWL_MVM_STATUS_HW_RFKILL: HW RF-kill is asserted

 * @IWL_MVM_STATUS_HW_CTKILL: CT-kill is active

 * @IWL_MVM_STATUS_ROC_RUNNING: remain-on-channel is running

 * @IWL_MVM_STATUS_HW_RESTART_REQUESTED: HW restart was requested

 * @IWL_MVM_STATUS_IN_HW_RESTART: HW restart is active

 * @IWL_MVM_STATUS_IN_D0I3: NIC is in D0i3

 * @IWL_MVM_STATUS_ROC_AUX_RUNNING: AUX remain-on-channel is running
@@ -1101,6 +1102,7 @@ enum iwl_mvm_status { 
	IWL_MVM_STATUS_HW_RFKILL,

	IWL_MVM_STATUS_HW_CTKILL,

	IWL_MVM_STATUS_ROC_RUNNING,

	IWL_MVM_STATUS_HW_RESTART_REQUESTED,

	IWL_MVM_STATUS_IN_HW_RESTART,

	IWL_MVM_STATUS_IN_D0I3,

	IWL_MVM_STATUS_ROC_AUX_RUNNING,