Commit eb6d9293 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Johannes Berg
Browse files

mac80211: deinline rate_control_rate_init, rate_control_rate_update 

With this .config: http://busybox.net/~vda/kernel_config

,
after deinlining these functions have sizes and callsite counts
as follows:

rate_control_rate_init: 554 bytes, 8 calls
rate_control_rate_update: 1596 bytes, 5 calls

Total size reduction: about 11 kbytes.

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
CC: John Linville <linville@tuxdriver.com>
CC: Michal Kazior <michal.kazior@tieto.com>
CC: Johannes Berg <johannes.berg@intel.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 727da60b

net/mac80211/rate.c

+59 −0
Original line number Diff line number Diff line
@@ -29,6 +29,65 @@ module_param(ieee80211_default_rc_algo, charp, 0644); 
MODULE_PARM_DESC(ieee80211_default_rc_algo,

		 "Default rate control algorithm for mac80211 to use");



void rate_control_rate_init(struct sta_info *sta)

{

	struct ieee80211_local *local = sta->sdata->local;

	struct rate_control_ref *ref = sta->rate_ctrl;

	struct ieee80211_sta *ista = &sta->sta;

	void *priv_sta = sta->rate_ctrl_priv;

	struct ieee80211_supported_band *sband;

	struct ieee80211_chanctx_conf *chanctx_conf;



	ieee80211_sta_set_rx_nss(sta);



	if (!ref)

		return;



	rcu_read_lock();



	chanctx_conf = rcu_dereference(sta->sdata->vif.chanctx_conf);

	if (WARN_ON(!chanctx_conf)) {

		rcu_read_unlock();

		return;

	}



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



	spin_lock_bh(&sta->rate_ctrl_lock);

	ref->ops->rate_init(ref->priv, sband, &chanctx_conf->def, ista,

			    priv_sta);

	spin_unlock_bh(&sta->rate_ctrl_lock);

	rcu_read_unlock();

	set_sta_flag(sta, WLAN_STA_RATE_CONTROL);

}



void rate_control_rate_update(struct ieee80211_local *local,

				    struct ieee80211_supported_band *sband,

				    struct sta_info *sta, u32 changed)

{

	struct rate_control_ref *ref = local->rate_ctrl;

	struct ieee80211_sta *ista = &sta->sta;

	void *priv_sta = sta->rate_ctrl_priv;

	struct ieee80211_chanctx_conf *chanctx_conf;



	if (ref && ref->ops->rate_update) {

		rcu_read_lock();



		chanctx_conf = rcu_dereference(sta->sdata->vif.chanctx_conf);

		if (WARN_ON(!chanctx_conf)) {

			rcu_read_unlock();

			return;

		}



		spin_lock_bh(&sta->rate_ctrl_lock);

		ref->ops->rate_update(ref->priv, sband, &chanctx_conf->def,

				      ista, priv_sta, changed);

		spin_unlock_bh(&sta->rate_ctrl_lock);

		rcu_read_unlock();

	}

	drv_sta_rc_update(local, sta->sdata, &sta->sta, changed);

}



int ieee80211_rate_control_register(const struct rate_control_ops *ops)

{

	struct rate_control_alg *alg;

net/mac80211/rate.h

+3 −57
Original line number Diff line number Diff line
@@ -71,64 +71,10 @@ rate_control_tx_status_noskb(struct ieee80211_local *local, 
	spin_unlock_bh(&sta->rate_ctrl_lock);

}



static inline void rate_control_rate_init(struct sta_info *sta)

{

	struct ieee80211_local *local = sta->sdata->local;

	struct rate_control_ref *ref = sta->rate_ctrl;

	struct ieee80211_sta *ista = &sta->sta;

	void *priv_sta = sta->rate_ctrl_priv;

	struct ieee80211_supported_band *sband;

	struct ieee80211_chanctx_conf *chanctx_conf;



	ieee80211_sta_set_rx_nss(sta);



	if (!ref)

		return;



	rcu_read_lock();



	chanctx_conf = rcu_dereference(sta->sdata->vif.chanctx_conf);

	if (WARN_ON(!chanctx_conf)) {

		rcu_read_unlock();

		return;

	}



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



	spin_lock_bh(&sta->rate_ctrl_lock);

	ref->ops->rate_init(ref->priv, sband, &chanctx_conf->def, ista,

			    priv_sta);

	spin_unlock_bh(&sta->rate_ctrl_lock);

	rcu_read_unlock();

	set_sta_flag(sta, WLAN_STA_RATE_CONTROL);

}



static inline void rate_control_rate_update(struct ieee80211_local *local,

void rate_control_rate_init(struct sta_info *sta);

void rate_control_rate_update(struct ieee80211_local *local,

				    struct ieee80211_supported_band *sband,

				    struct sta_info *sta, u32 changed)

{

	struct rate_control_ref *ref = local->rate_ctrl;

	struct ieee80211_sta *ista = &sta->sta;

	void *priv_sta = sta->rate_ctrl_priv;

	struct ieee80211_chanctx_conf *chanctx_conf;



	if (ref && ref->ops->rate_update) {

		rcu_read_lock();



		chanctx_conf = rcu_dereference(sta->sdata->vif.chanctx_conf);

		if (WARN_ON(!chanctx_conf)) {

			rcu_read_unlock();

			return;

		}



		spin_lock_bh(&sta->rate_ctrl_lock);

		ref->ops->rate_update(ref->priv, sband, &chanctx_conf->def,

				      ista, priv_sta, changed);

		spin_unlock_bh(&sta->rate_ctrl_lock);

		rcu_read_unlock();

	}

	drv_sta_rc_update(local, sta->sdata, &sta->sta, changed);

}

				    struct sta_info *sta, u32 changed);



static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,

					   struct sta_info *sta, gfp_t gfp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE