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

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

mac80211: Deinline drv_get/set/reset_tsf() 

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

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

drv_get_tsf: 634 bytes, 6 calls
drv_set_tsf: 626 bytes, 2 calls
drv_reset_tsf: 617 bytes, 2 calls

Total size reduction is about 4.2 kbytes.

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

net/mac80211/driver-ops.c

+46 −0
Original line number Original line Diff line number Diff line
@@ -139,6 +139,52 @@ int drv_conf_tx(struct ieee80211_local *local, 
	return ret;

	return ret;

}

}





u64 drv_get_tsf(struct ieee80211_local *local,

		struct ieee80211_sub_if_data *sdata)

{

	u64 ret = -1ULL;



	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return ret;



	trace_drv_get_tsf(local, sdata);

	if (local->ops->get_tsf)

		ret = local->ops->get_tsf(&local->hw, &sdata->vif);

	trace_drv_return_u64(local, ret);

	return ret;

}



void drv_set_tsf(struct ieee80211_local *local,

		 struct ieee80211_sub_if_data *sdata,

		 u64 tsf)

{

	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return;



	trace_drv_set_tsf(local, sdata, tsf);

	if (local->ops->set_tsf)

		local->ops->set_tsf(&local->hw, &sdata->vif, tsf);

	trace_drv_return_void(local);

}



void drv_reset_tsf(struct ieee80211_local *local,

		   struct ieee80211_sub_if_data *sdata)

{

	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return;



	trace_drv_reset_tsf(local, sdata);

	if (local->ops->reset_tsf)

		local->ops->reset_tsf(&local->hw, &sdata->vif);

	trace_drv_return_void(local);

}



int drv_switch_vif_chanctx(struct ieee80211_local *local,

int drv_switch_vif_chanctx(struct ieee80211_local *local,

			   struct ieee80211_vif_chanctx_switch *vifs,

			   struct ieee80211_vif_chanctx_switch *vifs,

			   int n_vifs, enum ieee80211_chanctx_switch_mode mode)

			   int n_vifs, enum ieee80211_chanctx_switch_mode mode)

net/mac80211/driver-ops.h

+7 −45
Original line number Original line Diff line number Diff line
@@ -590,51 +590,13 @@ int drv_conf_tx(struct ieee80211_local *local, 
		struct ieee80211_sub_if_data *sdata, u16 ac,

		struct ieee80211_sub_if_data *sdata, u16 ac,

		const struct ieee80211_tx_queue_params *params);

		const struct ieee80211_tx_queue_params *params);





static inline u64 drv_get_tsf(struct ieee80211_local *local,

u64 drv_get_tsf(struct ieee80211_local *local,

			      struct ieee80211_sub_if_data *sdata)

		struct ieee80211_sub_if_data *sdata);

{

void drv_set_tsf(struct ieee80211_local *local,

	u64 ret = -1ULL;



	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return ret;



	trace_drv_get_tsf(local, sdata);

	if (local->ops->get_tsf)

		ret = local->ops->get_tsf(&local->hw, &sdata->vif);

	trace_drv_return_u64(local, ret);

	return ret;

}



static inline void drv_set_tsf(struct ieee80211_local *local,

		 struct ieee80211_sub_if_data *sdata,

		 struct ieee80211_sub_if_data *sdata,

			       u64 tsf)

		 u64 tsf);

{

void drv_reset_tsf(struct ieee80211_local *local,

	might_sleep();

		   struct ieee80211_sub_if_data *sdata);



	if (!check_sdata_in_driver(sdata))

		return;



	trace_drv_set_tsf(local, sdata, tsf);

	if (local->ops->set_tsf)

		local->ops->set_tsf(&local->hw, &sdata->vif, tsf);

	trace_drv_return_void(local);

}



static inline void drv_reset_tsf(struct ieee80211_local *local,

				 struct ieee80211_sub_if_data *sdata)

{

	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return;



	trace_drv_reset_tsf(local, sdata);

	if (local->ops->reset_tsf)

		local->ops->reset_tsf(&local->hw, &sdata->vif);

	trace_drv_return_void(local);

}





static inline int drv_tx_last_beacon(struct ieee80211_local *local)

static inline int drv_tx_last_beacon(struct ieee80211_local *local)

{

{