wifi: mac80211: remove gfp parameter from ieee80211_obss_color_collision_notify

Get rid of gfp parameter from ieee80211_obss_color_collision_notify
since it is no longer used.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Link: https://msgid.link/f91e1c78896408ac556586ba8c99e4e389aeba02.1707389901.git.lorenzo@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 3c9f3b0bcfaa91185af4e49a0a1315a341be6973..1943e636faef2340d99084235f2770fe0550577f 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -4020,8 +4020,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:
-               ieee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap,
-                                                     GFP_KERNEL);
+               ieee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap);
                ath11k_dbg(ab, ATH11K_DBG_WMI,
                           "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",
                           ev->vdev_id, ev->evt_type, ev->obss_color_bitmap);

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 45d905b17a65cd34917ea49db2bbc8c5ce6b6aa8..fc223761e3afc98eb9ffa019ea1c4ce04c073cae 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -7490,11 +7490,10 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  * @color_bitmap: a 64 bit bitmap representing the colors that the local BSS is
  *     aware of.
- * @gfp: allocation flags
  */
 void
 ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
-                                     u64 color_bitmap, gfp_t gfp);
+                                     u64 color_bitmap);
 
 /**
  * ieee80211_is_tx_data - check if frame is a data frame

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 156a4215dcda7f89cff8ae566394868a6a11eba3..6f7c96c358f467b4d74aed72ee9ce7bd88b8ee7c 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4765,7 +4765,7 @@ EXPORT_SYMBOL_GPL(ieee80211_color_change_finish);
 
 void
 ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
-                                      u64 color_bitmap, gfp_t gfp)
+                                     u64 color_bitmap)
 {
        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
        struct ieee80211_link_data *link = &sdata->deflink;

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9902ea69af0a18fc785319916ac24af687d6d39d..c1f8501384056d3ebbb9ba7ddbd5c659c579d582 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3386,8 +3386,7 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx)
                                      IEEE80211_HE_OPERATION_BSS_COLOR_MASK);
                if (color == bss_conf->he_bss_color.color)
                        ieee80211_obss_color_collision_notify(&rx->sdata->vif,
-                                                             BIT_ULL(color),
-                                                             GFP_ATOMIC);
+                                                             BIT_ULL(color));
        }
 }