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

Commit 15f6d96d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mac80211-next-for-davem-2015-08-14' mac80211-next.git 

iwlwifi needs new mac80211 patches so merge mac80211-next.git to
wireless-drivers-next.git.
parents 94e92a7b 8f9c98df

drivers/net/wireless/iwlwifi/dvm/dev.h

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ struct iwl_priv { 
	/* ieee device used by generic ieee processing code */

	struct ieee80211_hw *hw;



	struct napi_struct *napi;



	struct list_head calib_results;



	struct workqueue_struct *workqueue;

drivers/net/wireless/iwlwifi/dvm/main.c

+2 −1
Original line number Diff line number Diff line
@@ -2037,7 +2037,8 @@ static void iwl_napi_add(struct iwl_op_mode *op_mode, 
{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);



	ieee80211_napi_add(priv->hw, napi, napi_dev, poll, weight);

	netif_napi_add(napi_dev, napi, poll, weight);

	priv->napi = napi;

}



static const struct iwl_op_mode_ops iwl_dvm_ops = {

drivers/net/wireless/iwlwifi/dvm/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv, 


	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));



	ieee80211_rx(priv->hw, skb);

	ieee80211_rx_napi(priv->hw, skb, priv->napi);

}



static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)

drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h

+2 −2
Original line number Diff line number Diff line
@@ -366,8 +366,8 @@ struct iwl_mvm_rm_sta_cmd { 
 * ( MGMT_MCAST_KEY = 0x1f )

 * @ctrl_flags: %iwl_sta_key_flag

 * @IGTK:

 * @K1: IGTK master key

 * @K2: IGTK sub key

 * @K1: unused

 * @K2: unused

 * @sta_id: station ID that support IGTK

 * @key_id:

 * @receive_seq_cnt: initial RSC/PN needed for replay check

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

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ struct iwl_mvm { 
	const struct iwl_cfg *cfg;

	struct iwl_phy_db *phy_db;

	struct ieee80211_hw *hw;

	struct napi_struct *napi;



	/* for protecting access to iwl_mvm */

	struct mutex mutex;