Commit 7840bd46 authored by Gregory Greenman's avatar Gregory Greenman Committed by Johannes Berg
Browse files

wifi: mac80211: remove link_id parameter from link_info_changed() 



Since struct ieee80211_bss_conf already contains link_id,
passing link_id is not necessary.

Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 727eff4d

drivers/net/wireless/mac80211_hwsim.c

+2 −1
Original line number Diff line number Diff line
@@ -2178,10 +2178,11 @@ static void mac80211_hwsim_vif_info_changed(struct ieee80211_hw *hw, 
static void mac80211_hwsim_link_info_changed(struct ieee80211_hw *hw,

					     struct ieee80211_vif *vif,

					     struct ieee80211_bss_conf *info,

					     u32 link_id, u64 changed)

					     u64 changed)

{

	struct hwsim_vif_priv *vp = (void *)vif->drv_priv;

	struct mac80211_hwsim_data *data = hw->priv;

	unsigned int link_id = info->link_id;

	struct mac80211_hwsim_link_data *link_data = &data->link_data[link_id];



	hwsim_check_magic(vif);

include/net/mac80211.h

+0 −1
Original line number Diff line number Diff line
@@ -4088,7 +4088,6 @@ struct ieee80211_ops { 
	void (*link_info_changed)(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  struct ieee80211_bss_conf *info,

				  unsigned int link_id,

				  u64 changed);



	int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

net/mac80211/driver-ops.h

+2 −2
Original line number Diff line number Diff line
@@ -190,10 +190,10 @@ static inline void drv_link_info_changed(struct ieee80211_local *local, 
	if (!check_sdata_in_driver(sdata))

		return;



	trace_drv_link_info_changed(local, sdata, info, link_id, changed);

	trace_drv_link_info_changed(local, sdata, info, changed);

	if (local->ops->link_info_changed)

		local->ops->link_info_changed(&local->hw, &sdata->vif,

					      info, link_id, changed);

					      info, changed);

	else if (local->ops->bss_info_changed)

		local->ops->bss_info_changed(&local->hw, &sdata->vif,

					     info, changed);

net/mac80211/main.c

+2 −3
Original line number Diff line number Diff line
@@ -248,11 +248,10 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, 


		/* FIXME: should be for each link */

		trace_drv_link_info_changed(local, sdata, &sdata->vif.bss_conf,

					    0, changed);

					    changed);

		if (local->ops->link_info_changed)

			local->ops->link_info_changed(&local->hw, &sdata->vif,

						      &sdata->vif.bss_conf,

						      0, ch);

						      &sdata->vif.bss_conf, ch);

	}



	if (local->ops->bss_info_changed)

net/mac80211/trace.h

+3 −3
Original line number Diff line number Diff line
@@ -449,9 +449,9 @@ TRACE_EVENT(drv_link_info_changed, 
	TP_PROTO(struct ieee80211_local *local,

		 struct ieee80211_sub_if_data *sdata,

		 struct ieee80211_bss_conf *link_conf,

		 int link_id, u64 changed),

		 u64 changed),



	TP_ARGS(local, sdata, link_conf, link_id, changed),

	TP_ARGS(local, sdata, link_conf, changed),



	TP_STRUCT__entry(

		LOCAL_ENTRY
@@ -486,7 +486,7 @@ TRACE_EVENT(drv_link_info_changed, 
		LOCAL_ASSIGN;

		VIF_ASSIGN;

		__entry->changed = changed;

		__entry->link_id = link_id;

		__entry->link_id = link_conf->link_id;

		__entry->shortpre = link_conf->use_short_preamble;

		__entry->cts = link_conf->use_cts_prot;

		__entry->shortslot = link_conf->use_short_slot;