wifi: rtw88: use cfg80211_ssid_eq() instead of rtw_ssid_equal()

Prefer generic 'cfg80211_ssid_eq()' over dropped 'rtw_ssid_equal()'.
Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Link: https://msgid.link/20231215123859.196350-3-dmantipov@yandex.ru
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index acd78311c8c4a12fe4d413d589fa184dc464db91..3f037ddcecf12c8ca097e060bfa98e8e34abf86b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -998,7 +998,7 @@ static u8 rtw_get_rsvd_page_probe_req_location(struct rtw_dev *rtwdev,
                if (rsvd_pkt->type != RSVD_PROBE_REQ)
                        continue;
                if ((!ssid && !rsvd_pkt->ssid) ||
-                   rtw_ssid_equal(rsvd_pkt->ssid, ssid))
+                   cfg80211_ssid_eq(rsvd_pkt->ssid, ssid))
                        location = rsvd_pkt->page;
        }
 
@@ -1015,7 +1015,7 @@ static u16 rtw_get_rsvd_page_probe_req_size(struct rtw_dev *rtwdev,
                if (rsvd_pkt->type != RSVD_PROBE_REQ)
                        continue;
                if ((!ssid && !rsvd_pkt->ssid) ||
-                   rtw_ssid_equal(rsvd_pkt->ssid, ssid))
+                   cfg80211_ssid_eq(rsvd_pkt->ssid, ssid))
                        size = rsvd_pkt->probe_req_size;
        }
 

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index b6bfd4c02e2db3f91108630aa58b0fe96afb08d5..e14d1da43940fa0700fecf58114dd4afe1bf75fb 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -2090,18 +2090,6 @@ static inline struct ieee80211_vif *rtwvif_to_vif(struct rtw_vif *rtwvif)
        return container_of(p, struct ieee80211_vif, drv_priv);
 }
 
-static inline bool rtw_ssid_equal(struct cfg80211_ssid *a,
-                                 struct cfg80211_ssid *b)
-{
-       if (!a || !b || a->ssid_len != b->ssid_len)
-               return false;
-
-       if (memcmp(a->ssid, b->ssid, a->ssid_len))
-               return false;
-
-       return true;
-}
-
 static inline void rtw_chip_efuse_grant_on(struct rtw_dev *rtwdev)
 {
        if (rtwdev->chip->ops->efuse_grant)