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

Commit 0bc1c7f6 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

mac80211: set IEEE80211_TX_CTRL_PORT_CTRL_PROTO for nl80211 TX 



commit b95d2ccd2ccb834394d50347d0e40dc38a954e4a upstream.

When a frame is transmitted via the nl80211 TX rather than as a
normal frame, IEEE80211_TX_CTRL_PORT_CTRL_PROTO wasn't set and
this will lead to wrong decisions (rate control etc.) being made
about the frame; fix this.

Fixes: 91180649 ("mac80211: Add support for tx_control_port")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200326155333.f183f52b02f0.I4054e2a8c11c2ddcb795a0103c87be3538690243@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74fdc220

net/mac80211/tx.c

+6 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018, 2020 Intel Corporation

 *

 * Transmit and frame generation functions.

 */
@@ -5067,6 +5067,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, 
	struct ieee80211_local *local = sdata->local;

	struct sk_buff *skb;

	struct ethhdr *ehdr;

	u32 ctrl_flags = 0;

	u32 flags;



	/* Only accept CONTROL_PORT_PROTOCOL configured in CONNECT/ASSOCIATE
@@ -5076,6 +5077,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, 
	    proto != cpu_to_be16(ETH_P_PREAUTH))

		return -EINVAL;



	if (proto == sdata->control_port_protocol)

		ctrl_flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO;



	if (unencrypted)

		flags = IEEE80211_TX_INTFL_DONT_ENCRYPT;

	else
@@ -5101,7 +5105,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, 
	skb_reset_mac_header(skb);



	local_bh_disable();

	__ieee80211_subif_start_xmit(skb, skb->dev, flags, 0);

	__ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags);

	local_bh_enable();



	return 0;