Commit 82253dda authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: drop extra 'e' from ieeee80211... name 



Somehow an extra 'e' slipped in there without anyone noticing,
drop that from ieeee80211_obss_color_collision_notify().

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3609ff64

drivers/net/wireless/ath/ath11k/wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -3853,7 +3853,7 @@ ath11k_wmi_obss_color_collision_event(struct ath11k_base *ab, struct sk_buff *sk 


	switch (ev->evt_type) {

	case WMI_BSS_COLOR_COLLISION_DETECTION:

		ieeee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap,

		ieee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap,

						      GFP_KERNEL);

		ath11k_dbg(ab, ATH11K_DBG_WMI,

			   "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",

include/net/mac80211.h

+3 −3
Original line number Diff line number Diff line
@@ -7210,7 +7210,7 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw, 
					  struct ieee80211_vif *vif);



/**

 * ieeee80211_obss_color_collision_notify - notify userland about a BSS color

 * ieee80211_obss_color_collision_notify - notify userland about a BSS color

 * collision.

 *

 * @vif: &struct ieee80211_vif pointer from the add_interface callback.
@@ -7219,7 +7219,7 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw, 
 * @gfp: allocation flags

 */

void

ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif,

ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,

				      u64 color_bitmap, gfp_t gfp);



/**

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -4662,7 +4662,7 @@ void ieee80211_color_change_finish(struct ieee80211_vif *vif) 
EXPORT_SYMBOL_GPL(ieee80211_color_change_finish);



void

ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif,

ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,

				       u64 color_bitmap, gfp_t gfp)

{

	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
@@ -4672,7 +4672,7 @@ ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif, 


	cfg80211_obss_color_collision_notify(sdata->dev, color_bitmap, gfp);

}

EXPORT_SYMBOL_GPL(ieeee80211_obss_color_collision_notify);

EXPORT_SYMBOL_GPL(ieee80211_obss_color_collision_notify);



static int

ieee80211_color_change(struct wiphy *wiphy, struct net_device *dev,

net/mac80211/rx.c

+3 −3
Original line number Diff line number Diff line
@@ -3219,7 +3219,7 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx) 
		color = le32_get_bits(he_oper->he_oper_params,

				      IEEE80211_HE_OPERATION_BSS_COLOR_MASK);

		if (color == bss_conf->he_bss_color.color)

			ieeee80211_obss_color_collision_notify(&rx->sdata->vif,

			ieee80211_obss_color_collision_notify(&rx->sdata->vif,

							      BIT_ULL(color),

							      GFP_ATOMIC);

	}