2024-02-08 11:09:18

by Lorenzo Bianconi

Subject: [PATCH wireless] wifi: mac80211: remove gfp parameter from ieee80211_obss_color_collision_notify signature

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

Signed-off-by: Lorenzo Bianconi <[email protected]>
---
drivers/net/wireless/ath/ath11k/wmi.c | 3 +--
include/net/mac80211.h | 3 +--
net/mac80211/cfg.c | 2 +-
net/mac80211/rx.c | 3 +--
4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 8a65fa04b48d..ad22f8d775db 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -3956,8 +3956,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 d400fe2e8668..9cae95a0c300 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -7416,11 +7416,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 327682995c92..382b4208cc6a 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4749,7 +4749,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 0bf72928ccfc..73717875e3f6 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3369,8 +3369,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));
}
}

--
2.43.0

2024-02-09 00:02:22

by Jeff Johnson

Subject: Re: [PATCH wireless] wifi: mac80211: remove gfp parameter from ieee80211_obss_color_collision_notify signature

On 2/8/2024 3:01 AM, Lorenzo Bianconi wrote:
> Get rid of gfp parameter from ieee80211_obss_color_collision_notify
> signature since it is no longer used.
>
> Signed-off-by: Lorenzo Bianconi <[email protected]>
Reviewed-by: Jeff Johnson <[email protected]>
Acked-by: Jeff Johnson <[email protected]>