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

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

mac80211: Send the management frame at requested rate 



Whenever the scan request or tx_mgmt is requesting not to
use CCK rate for managemet frames through
NL80211_ATTR_TX_NO_CCK_RATE attribute, then mac80211 should
select appropriate least non-CCK rate. This could help to
send P2P probes and P2P action frames at non 11b rates
without diabling 11b rates globally.

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 e9f935e3

include/net/mac80211.h

+4 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ struct ieee80211_bss_conf { 
 * @IEEE80211_TX_INTFL_TKIP_MIC_FAILURE: Marks this packet to be used for TKIP

 *	testing. It will be sent out with incorrect Michael MIC key to allow

 *	TKIP countermeasures to be tested.

 * @IEEE80211_TX_CTL_NO_CCK_RATE: This frame will be sent at non CCK rate.

 *	This flag is actually used for management frame especially for P2P

 *	frames not being sent at CCK rate in 2GHz band.

 *

 * Note: If you have to add new flags to the enumeration, then don't

 *	 forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
@@ -393,6 +396,7 @@ enum mac80211_tx_control_flags { 
	IEEE80211_TX_CTL_STBC			= BIT(23) | BIT(24),

	IEEE80211_TX_CTL_TX_OFFCHAN		= BIT(25),

	IEEE80211_TX_INTFL_TKIP_MIC_FAILURE	= BIT(26),

	IEEE80211_TX_CTL_NO_CCK_RATE		= BIT(27),

};



#define IEEE80211_TX_CTL_STBC_SHIFT		23

net/mac80211/cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -1897,6 +1897,9 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, 
		flags |= IEEE80211_TX_CTL_TX_OFFCHAN;

	}



	if (no_cck)

		flags |= IEEE80211_TX_CTL_NO_CCK_RATE;



	if (is_offchan && !offchan)

		return -EBUSY;

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, 
void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,

			      const u8 *ssid, size_t ssid_len,

			      const u8 *ie, size_t ie_len,

			      u32 ratemask, bool directed);

			      u32 ratemask, bool directed, bool no_cck);



void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,

				  const size_t supp_rates_len,

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) 
	} else {

		ssid = ieee80211_bss_get_ie(ifmgd->associated, WLAN_EID_SSID);

		ieee80211_send_probe_req(sdata, dst, ssid + 2, ssid[1], NULL, 0,

					 (u32) -1, true);

					 (u32) -1, true, false);

	}



	ifmgd->probe_send_count++;

net/mac80211/rate.c

+28 −1
Original line number Diff line number Diff line
@@ -233,6 +233,27 @@ static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, 
	/* could not find a basic rate; use original selection */

}



static inline s8

rate_lowest_non_cck_index(struct ieee80211_supported_band *sband,

			  struct ieee80211_sta *sta)

{

	int i;



	for (i = 0; i < sband->n_bitrates; i++) {

		struct ieee80211_rate *srate = &sband->bitrates[i];

		if ((srate->bitrate == 10) || (srate->bitrate == 20) ||

		    (srate->bitrate == 55) || (srate->bitrate == 110))

			continue;



		if (rate_supported(sta, sband->band, i))

			return i;

	}



	/* No matching rate found */

	return 0;

}





bool rate_control_send_low(struct ieee80211_sta *sta,

			   void *priv_sta,

			   struct ieee80211_tx_rate_control *txrc)
@@ -242,7 +263,13 @@ bool rate_control_send_low(struct ieee80211_sta *sta, 
	int mcast_rate;



	if (!sta || !priv_sta || rc_no_data_or_no_ack(txrc)) {

		info->control.rates[0].idx = rate_lowest_index(txrc->sband, sta);

		if ((sband->band != IEEE80211_BAND_2GHZ) ||

		    !(info->flags & IEEE80211_TX_CTL_NO_CCK_RATE))

			info->control.rates[0].idx =

				rate_lowest_index(txrc->sband, sta);

		else

			info->control.rates[0].idx =

				rate_lowest_non_cck_index(txrc->sband, sta);

		info->control.rates[0].count =

			(info->flags & IEEE80211_TX_CTL_NO_ACK) ?

			1 : txrc->hw->max_rate_tries;