Commit af61a165 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: add control port protocol TX control flag 



A lot of drivers check the frame protocol for ETH_P_PAE,
for various reasons (like making those more reliable).
Add a new flags bitmap to the TX control info and a new
flag indicating the control port protocol is in use to
let all drivers also apply such logic to other control
port protocols, should they be configured.

Also use the new flag in the iwlwifi drivers.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1da5fcc8

Documentation/DocBook/80211.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ 
          <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h mac80211_tx_info_flags

!Finclude/net/mac80211.h mac80211_tx_control_flags

!Finclude/net/mac80211.h mac80211_rate_control_flags

!Finclude/net/mac80211.h ieee80211_tx_rate

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv, 
		 priv->lib->bt_params->advanced_bt_coexist &&

		 (ieee80211_is_auth(fc) || ieee80211_is_assoc_req(fc) ||

		 ieee80211_is_reassoc_req(fc) ||

		 skb->protocol == cpu_to_be16(ETH_P_PAE)))

		 info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO))

		tx_flags |= TX_CMD_FLG_IGNORE_BT;

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

+4 −3
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ 
static inline bool iwl_trace_data(struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (void *)skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	if (ieee80211_is_data(hdr->frame_control))

		return skb->protocol != cpu_to_be16(ETH_P_PAE);

	if (!ieee80211_is_data(hdr->frame_control))

		return false;

	return !(info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO);

}



static inline size_t iwl_rx_trace_len(const struct iwl_trans *trans,

drivers/net/wireless/iwlwifi/mvm/tx.c

+4 −5
Original line number Diff line number Diff line
@@ -92,10 +92,9 @@ static void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb, 


	/* High prio packet (wrt. BT coex) if it is EAPOL, MCAST or MGMT */

	if (info->band == IEEE80211_BAND_2GHZ &&

	    (skb->protocol == cpu_to_be16(ETH_P_PAE)  ||

	    (info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO ||

	     is_multicast_ether_addr(hdr->addr1) ||

	     ieee80211_is_back_req(fc)                ||

	     ieee80211_is_mgmt(fc)))

	     ieee80211_is_back_req(fc) || ieee80211_is_mgmt(fc)))

		tx_flags |= TX_CMD_FLG_BT_DIS;



	if (ieee80211_has_morefrags(fc))

include/net/mac80211.h

+16 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ struct ieee80211_bss_conf { 
};



/**

 * enum mac80211_tx_control_flags - flags to describe transmission information/status

 * enum mac80211_tx_info_flags - flags to describe transmission information/status

 *

 * These flags are used with the @flags member of &ieee80211_tx_info.

 *
@@ -471,7 +471,7 @@ struct ieee80211_bss_conf { 
 * Note: If you have to add new flags to the enumeration, then don't

 *	 forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.

 */

enum mac80211_tx_control_flags {

enum mac80211_tx_info_flags {

	IEEE80211_TX_CTL_REQ_TX_STATUS		= BIT(0),

	IEEE80211_TX_CTL_ASSIGN_SEQ		= BIT(1),

	IEEE80211_TX_CTL_NO_ACK			= BIT(2),
@@ -507,6 +507,18 @@ enum mac80211_tx_control_flags { 


#define IEEE80211_TX_CTL_STBC_SHIFT		23



/**

 * enum mac80211_tx_control_flags - flags to describe transmit control

 *

 * @IEEE80211_TX_CTRL_PORT_CTRL_PROTO: this frame is a port control

 *	protocol frame (e.g. EAP)

 *

 * These flags are used in tx_info->control.flags.

 */

enum mac80211_tx_control_flags {

	IEEE80211_TX_CTRL_PORT_CTRL_PROTO	= BIT(0),

};



/*

 * This definition is used as a mask to clear all temporary flags, which are

 * set by the tx handlers for each transmission attempt by the mac80211 stack.
@@ -680,7 +692,8 @@ struct ieee80211_tx_info { 
			/* NB: vif can be NULL for injected frames */

			struct ieee80211_vif *vif;

			struct ieee80211_key_conf *hw_key;

			/* 8 bytes free */

			u32 flags;

			/* 4 bytes free */

		} control;

		struct {

			struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];

CRA Git | Maintained and supported by SUSTech CRA and CCSE