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

Commit b422c6cd authored by Ashok Nagarajan's avatar Ashok Nagarajan Committed by Johannes Berg
Browse files

{cfg,mac}80211: move mandatory rates calculation to cfg80211 



Move mandatory rates calculation to cfg80211, shared with non mac80211 drivers.

Signed-off-by: default avatarAshok Nagarajan <ashok@cozybit.com>
[extend documentation]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d4a5a489

include/net/cfg80211.h

+9 −0
Original line number Diff line number Diff line
@@ -3005,6 +3005,15 @@ struct ieee80211_rate * 
ieee80211_get_response_rate(struct ieee80211_supported_band *sband,

			    u32 basic_rates, int bitrate);



/**

 * ieee80211_mandatory_rates - get mandatory rates for a given band

 * @sband: the band to look for rates in

 *

 * This function returns a bitmap of the mandatory rates for the given

 * band, bits are set according to the rate position in the bitrates array.

 */

u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband);



/*

 * Radiotap parsing functions -- for controlled injection support

 *

net/mac80211/ibss.c

+7 −3
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

	struct ieee80211_chanctx_conf *chanctx_conf;

	struct ieee80211_supported_band *sband;

	int band;



	/*
@@ -380,8 +381,9 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 
	sta->last_rx = jiffies;



	/* make sure mandatory rates are always added */

	sband = local->hw.wiphy->bands[band];

	sta->sta.supp_rates[band] = supp_rates |

			ieee80211_mandatory_rates(local, band);

			ieee80211_mandatory_rates(sband);



	return ieee80211_ibss_finish_sta(sta, auth);

}
@@ -492,7 +494,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
				prev_rates = sta->sta.supp_rates[band];

				/* make sure mandatory rates are always added */

				sta->sta.supp_rates[band] = supp_rates |

					ieee80211_mandatory_rates(local, band);

					ieee80211_mandatory_rates(sband);



				if (sta->sta.supp_rates[band] != prev_rates) {

					ibss_dbg(sdata,
@@ -624,6 +626,7 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

	struct ieee80211_chanctx_conf *chanctx_conf;

	struct ieee80211_supported_band *sband;

	int band;



	/*
@@ -658,8 +661,9 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata, 
	sta->last_rx = jiffies;



	/* make sure mandatory rates are always added */

	sband = local->hw.wiphy->bands[band];

	sta->sta.supp_rates[band] = supp_rates |

			ieee80211_mandatory_rates(local, band);

			ieee80211_mandatory_rates(sband);



	spin_lock(&ifibss->incomplete_lock);

	list_add(&sta->list, &ifibss->incomplete_stations);

net/mac80211/ieee80211_i.h

+0 −3
Original line number Diff line number Diff line
@@ -1505,9 +1505,6 @@ static inline void ieee802_11_parse_elems(u8 *start, size_t len, bool action, 
	ieee802_11_parse_elems_crc(start, len, action, elems, 0, 0);

}



u32 ieee80211_mandatory_rates(struct ieee80211_local *local,

			      enum ieee80211_band band);



void ieee80211_dynamic_ps_enable_work(struct work_struct *work);

void ieee80211_dynamic_ps_disable_work(struct work_struct *work);

void ieee80211_dynamic_ps_timer(unsigned long data);

net/mac80211/mesh.c

+3 −2
Original line number Diff line number Diff line
@@ -741,6 +741,8 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) 
		      BSS_CHANGED_BASIC_RATES |

		      BSS_CHANGED_BEACON_INT;

	enum ieee80211_band band = ieee80211_get_sdata_band(sdata);

	struct ieee80211_supported_band *sband =

					sdata->local->hw.wiphy->bands[band];



	local->fif_other_bss++;

	/* mesh ifaces must set allmulti to forward mcast traffic */
@@ -758,8 +760,7 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) 
	sdata->vif.bss_conf.ht_operation_mode =

				ifmsh->mshcfg.ht_opmode;

	sdata->vif.bss_conf.enable_beacon = true;

	sdata->vif.bss_conf.basic_rates =

		ieee80211_mandatory_rates(local, band);

	sdata->vif.bss_conf.basic_rates = ieee80211_mandatory_rates(sband);



	changed |= ieee80211_mps_local_status_update(sdata);

net/mac80211/util.c

+0 −26
Original line number Diff line number Diff line
@@ -1072,32 +1072,6 @@ void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, 
	ieee80211_set_wmm_default(sdata, true);

}



u32 ieee80211_mandatory_rates(struct ieee80211_local *local,

			      enum ieee80211_band band)

{

	struct ieee80211_supported_band *sband;

	struct ieee80211_rate *bitrates;

	u32 mandatory_rates;

	enum ieee80211_rate_flags mandatory_flag;

	int i;



	sband = local->hw.wiphy->bands[band];

	if (WARN_ON(!sband))

		return 1;



	if (band == IEEE80211_BAND_2GHZ)

		mandatory_flag = IEEE80211_RATE_MANDATORY_B;

	else

		mandatory_flag = IEEE80211_RATE_MANDATORY_A;



	bitrates = sband->bitrates;

	mandatory_rates = 0;

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

		if (bitrates[i].flags & mandatory_flag)

			mandatory_rates |= BIT(i);

	return mandatory_rates;

}



void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,

			 u16 transaction, u16 auth_alg, u16 status,

			 const u8 *extra, size_t extra_len, const u8 *da,