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

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

mac80211: Deinline drv_conf_tx() 

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

,
after deinlining the function size is 785 bytes and there are
7 callsites.

Total size reduction is about 3.5 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: linux-kernel@vger.kernel.org
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 35afa588

net/mac80211/driver-ops.c

+25 −0
Original line number Diff line number Diff line
@@ -39,3 +39,28 @@ int drv_sta_state(struct ieee80211_local *local, 
	trace_drv_return_int(local, ret);

	return ret;

}



int drv_conf_tx(struct ieee80211_local *local,

		struct ieee80211_sub_if_data *sdata, u16 ac,

		const struct ieee80211_tx_queue_params *params)

{

	int ret = -EOPNOTSUPP;



	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return -EIO;



	if (WARN_ONCE(params->cw_min == 0 ||

		      params->cw_min > params->cw_max,

		      "%s: invalid CW_min/CW_max: %d/%d\n",

		      sdata->name, params->cw_min, params->cw_max))

		return -EINVAL;



	trace_drv_conf_tx(local, sdata, ac, params);

	if (local->ops->conf_tx)

		ret = local->ops->conf_tx(&local->hw, &sdata->vif,

					  ac, params);

	trace_drv_return_int(local, ret);

	return ret;

}

net/mac80211/driver-ops.h

+3 −24
Original line number Diff line number Diff line
@@ -646,30 +646,9 @@ static inline void drv_sta_statistics(struct ieee80211_local *local, 
	trace_drv_return_void(local);

}



static inline int drv_conf_tx(struct ieee80211_local *local,

int drv_conf_tx(struct ieee80211_local *local,

		struct ieee80211_sub_if_data *sdata, u16 ac,

			      const struct ieee80211_tx_queue_params *params)

{

	int ret = -EOPNOTSUPP;



	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return -EIO;



	if (WARN_ONCE(params->cw_min == 0 ||

		      params->cw_min > params->cw_max,

		      "%s: invalid CW_min/CW_max: %d/%d\n",

		      sdata->name, params->cw_min, params->cw_max))

		return -EINVAL;



	trace_drv_conf_tx(local, sdata, ac, params);

	if (local->ops->conf_tx)

		ret = local->ops->conf_tx(&local->hw, &sdata->vif,

					  ac, params);

	trace_drv_return_int(local, ret);

	return ret;

}

		const struct ieee80211_tx_queue_params *params);



static inline u64 drv_get_tsf(struct ieee80211_local *local,

			      struct ieee80211_sub_if_data *sdata)