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

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

mac80211: Deinline drv_ampdu_action() 

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

,
after deinlining the function size is 755 bytes and there are
6 callsites.

Total size reduction is about 3.3 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 42677ed3

net/mac80211/driver-ops.c

+26 −0
Original line number Diff line number Diff line
@@ -189,3 +189,29 @@ int drv_switch_vif_chanctx(struct ieee80211_local *local, 


	return ret;

}



int drv_ampdu_action(struct ieee80211_local *local,

		     struct ieee80211_sub_if_data *sdata,

		     enum ieee80211_ampdu_mlme_action action,

		     struct ieee80211_sta *sta, u16 tid,

		     u16 *ssn, u8 buf_size, bool amsdu)

{

	int ret = -EOPNOTSUPP;



	might_sleep();



	sdata = get_bss_sdata(sdata);

	if (!check_sdata_in_driver(sdata))

		return -EIO;



	trace_drv_ampdu_action(local, sdata, action, sta, tid,

			       ssn, buf_size, amsdu);



	if (local->ops->ampdu_action)

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

					       sta, tid, ssn, buf_size, amsdu);



	trace_drv_return_int(local, ret);



	return ret;

}

net/mac80211/driver-ops.h

+5 −25
Original line number Diff line number Diff line
@@ -649,31 +649,11 @@ static inline int drv_tx_last_beacon(struct ieee80211_local *local) 
	return ret;

}



static inline int drv_ampdu_action(struct ieee80211_local *local,

int drv_ampdu_action(struct ieee80211_local *local,

		     struct ieee80211_sub_if_data *sdata,

		     enum ieee80211_ampdu_mlme_action action,

		     struct ieee80211_sta *sta, u16 tid,

				   u16 *ssn, u8 buf_size, bool amsdu)

{

	int ret = -EOPNOTSUPP;



	might_sleep();



	sdata = get_bss_sdata(sdata);

	if (!check_sdata_in_driver(sdata))

		return -EIO;



	trace_drv_ampdu_action(local, sdata, action, sta, tid,

			       ssn, buf_size, amsdu);



	if (local->ops->ampdu_action)

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

					       sta, tid, ssn, buf_size, amsdu);



	trace_drv_return_int(local, ret);



	return ret;

}

		     u16 *ssn, u8 buf_size, bool amsdu);



static inline int drv_get_survey(struct ieee80211_local *local, int idx,

				struct survey_info *survey)