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

Commit e9f935e3 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

nl80211/cfg80211: Add support to disable CCK rate for management frame 



Add a new nl80211 attribute to specify whether to send the management
frames in CCK rate or not. As of now the wpa_supplicant is disabling
CCK rate at P2P init itself. So this patch helps to send P2P probe
request/probe response/action frames being sent at non CCK rate in 2GHz
without disabling 11b rates.

This attribute is used with NL80211_CMD_TRIGGER_SCAN and
NL80211_CMD_FRAME commands to disable CCK rate for management frame
transmission.

Cc: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8ebafde0

include/linux/nl80211.h

+13 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ 
 *

 * @NL80211_CMD_GET_SCAN: get scan results

 * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters

 *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the

 *	probe requests at CCK rate or not.

 * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to

 *	NL80211_CMD_GET_SCAN and on the "scan" multicast group)

 * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
@@ -432,6 +434,8 @@ 
 *	specified using %NL80211_ATTR_DURATION. When called, this operation

 *	returns a cookie (%NL80211_ATTR_COOKIE) that will be included with the

 *	TX status event pertaining to the TX request.

 *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the

 *	management frames at CCK rate or not in 2GHz band.

 * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this

 *	command may be used with the corresponding cookie to cancel the wait

 *	time if it is known that it is no longer necessary.
@@ -1078,6 +1082,13 @@ enum nl80211_commands { 
 * @NL80211_ATTR_PMKSA_CANDIDATE: Nested attribute containing the PMKSA caching

 *	candidate information, see &enum nl80211_pmksa_candidate_attr.

 *

 * @NL80211_ATTR_TX_NO_CCK_RATE: Indicates whether to use CCK rate or not

 *	for management frames transmission. In order to avoid p2p probe/action

 *	frames are being transmitted at CCK rate in 2GHz band, the user space

 *	applications use this attribute.

 *	This attribute is used with %NL80211_CMD_TRIGGER_SCAN and

 *	%NL80211_CMD_FRAME commands.

 *

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use

 */
@@ -1298,6 +1309,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_PMKSA_CANDIDATE,



	NL80211_ATTR_TX_NO_CCK_RATE,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,

include/net/cfg80211.h

+4 −1
Original line number Diff line number Diff line
@@ -860,6 +860,7 @@ struct cfg80211_ssid { 
 * @wiphy: the wiphy this was for

 * @dev: the interface

 * @aborted: (internal) scan request was notified as aborted

 * @no_cck: used to send probe requests at non CCK rate in 2GHz band

 */

struct cfg80211_scan_request {

	struct cfg80211_ssid *ssids;
@@ -874,6 +875,7 @@ struct cfg80211_scan_request { 
	struct wiphy *wiphy;

	struct net_device *dev;

	bool aborted;

	bool no_cck;



	/* keep last */

	struct ieee80211_channel *channels[0];
@@ -1560,7 +1562,8 @@ struct cfg80211_ops { 
			  struct ieee80211_channel *chan, bool offchan,

			  enum nl80211_channel_type channel_type,

			  bool channel_type_valid, unsigned int wait,

			  const u8 *buf, size_t len, u64 *cookie);

			  const u8 *buf, size_t len, bool no_cck,

			  u64 *cookie);

	int	(*mgmt_tx_cancel_wait)(struct wiphy *wiphy,

				       struct net_device *dev,

				       u64 cookie);

net/mac80211/cfg.c

+2 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,8 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, 
			     struct ieee80211_channel *chan, bool offchan,

			     enum nl80211_channel_type channel_type,

			     bool channel_type_valid, unsigned int wait,

			     const u8 *buf, size_t len, u64 *cookie)

			     const u8 *buf, size_t len, bool no_cck,

			     u64 *cookie)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = sdata->local;

net/wireless/core.h

+2 −1
Original line number Diff line number Diff line
@@ -375,7 +375,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, 
			  struct ieee80211_channel *chan, bool offchan,

			  enum nl80211_channel_type channel_type,

			  bool channel_type_valid, unsigned int wait,

			  const u8 *buf, size_t len, u64 *cookie);

			  const u8 *buf, size_t len, bool no_cck,

			  u64 *cookie);



/* SME */

int __cfg80211_connect(struct cfg80211_registered_device *rdev,

net/wireless/mlme.c

+3 −2
Original line number Diff line number Diff line
@@ -900,7 +900,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, 
			  struct ieee80211_channel *chan, bool offchan,

			  enum nl80211_channel_type channel_type,

			  bool channel_type_valid, unsigned int wait,

			  const u8 *buf, size_t len, u64 *cookie)

			  const u8 *buf, size_t len, bool no_cck,

			  u64 *cookie)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	const struct ieee80211_mgmt *mgmt;
@@ -991,7 +992,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, 
	/* Transmit the Action frame as requested by user space */

	return rdev->ops->mgmt_tx(&rdev->wiphy, dev, chan, offchan,

				  channel_type, channel_type_valid,

				  wait, buf, len, cookie);

				  wait, buf, len, no_cck, cookie);

}



bool cfg80211_rx_mgmt(struct net_device *dev, int freq, const u8 *buf,