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

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

Merge tag 'mac80211-next-for-davem-2016-04-06' of... 

Merge tag 'mac80211-next-for-davem-2016-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
For the 4.7 cycle, we have a number of changes:
 * Bob's mesh mode rhashtable conversion, this includes
   the rhashtable API change for allocation flags
 * BSSID scan, connect() command reassoc support (Jouni)
 * fast (optimised data only) and support for RSS in mac80211 (myself)
 * various smaller changes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 07016151 4ce2bd9c

Documentation/networking/mac80211-injection.txt

+15 −2
Original line number Diff line number Diff line
@@ -37,14 +37,27 @@ radiotap headers and used to control injection: 
   HT rate for the transmission (only for devices without own rate control).

   Also some flags are parsed



   IEEE80211_TX_RC_SHORT_GI: use short guard interval

   IEEE80211_TX_RC_40_MHZ_WIDTH: send in HT40 mode

   IEEE80211_RADIOTAP_MCS_SGI: use short guard interval

   IEEE80211_RADIOTAP_MCS_BW_40: send in HT40 mode



 * IEEE80211_RADIOTAP_DATA_RETRIES



   number of retries when either IEEE80211_RADIOTAP_RATE or

   IEEE80211_RADIOTAP_MCS was used



 * IEEE80211_RADIOTAP_VHT



   VHT mcs and number of streams used in the transmission (only for devices

   without own rate control). Also other fields are parsed



   flags field

   IEEE80211_RADIOTAP_VHT_FLAG_SGI: use short guard interval



   bandwidth field

   1: send using 40MHz channel width

   4: send using 80MHz channel width

   11: send using 160MHz channel width



The injection code can also skip all other currently defined radiotap fields

facilitating replay of captured radiotap headers directly.

drivers/net/wireless/ath/ath10k/htt_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static void ath10k_process_rx(struct ath10k *ar, 
	*status = *rx_status;



	ath10k_dbg(ar, ATH10K_DBG_DATA,

		   "rx skb %p len %u peer %pM %s %s sn %u %s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",

		   "rx skb %p len %u peer %pM %s %s sn %u %s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%llx fcs-err %i mic-err %i amsdu-more %i\n",

		   skb,

		   skb->len,

		   ieee80211_get_SA(hdr),

drivers/net/wireless/ath/wcn36xx/txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb) 
		       RX_FLAG_MMIC_STRIPPED |

		       RX_FLAG_DECRYPTED;



	wcn36xx_dbg(WCN36XX_DBG_RX, "status.flags=%x\n", status.flag);

	wcn36xx_dbg(WCN36XX_DBG_RX, "status.flags=%llx\n", status.flag);



	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));

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

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


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



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

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

}



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

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -1499,5 +1499,5 @@ void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm, 
	memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));



	/* pass it as regular rx to mac80211 */

	ieee80211_rx_napi(mvm->hw, skb, NULL);

	ieee80211_rx_napi(mvm->hw, NULL, skb, NULL);

}