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

Commit 63f7535d authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: use IEEE80211_TX_CTRL_PORT_CTRL_PROTO flag 



Instead of checking the SKB protocol against EAP, check the
IEEE80211_TX_CTRL_PORT_CTRL_PROTO flag that more generally
indicates whether or not the frame is a port control frame.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 7b1dd048

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb, 
		 * it

		 */

		WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_AMPDU);

	} else if (skb->protocol == cpu_to_be16(ETH_P_PAE)) {

	} else if (info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO) {

		tx_cmd->pm_frame_timeout = cpu_to_le16(2);

	} else {

		tx_cmd->pm_frame_timeout = 0;