Commit aa3e193d authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Johannes Berg

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: default avatarDmitry Antipov <dmantipov@yandex.ru>
Link: https://msgid.link/20231215123859.196350-3-dmantipov@yandex.ruSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 323e79d4
...@@ -998,7 +998,7 @@ static u8 rtw_get_rsvd_page_probe_req_location(struct rtw_dev *rtwdev, ...@@ -998,7 +998,7 @@ static u8 rtw_get_rsvd_page_probe_req_location(struct rtw_dev *rtwdev,
if (rsvd_pkt->type != RSVD_PROBE_REQ) if (rsvd_pkt->type != RSVD_PROBE_REQ)
continue; continue;
if ((!ssid && !rsvd_pkt->ssid) || if ((!ssid && !rsvd_pkt->ssid) ||
rtw_ssid_equal(rsvd_pkt->ssid, ssid)) cfg80211_ssid_eq(rsvd_pkt->ssid, ssid))
location = rsvd_pkt->page; location = rsvd_pkt->page;
} }
...@@ -1015,7 +1015,7 @@ static u16 rtw_get_rsvd_page_probe_req_size(struct rtw_dev *rtwdev, ...@@ -1015,7 +1015,7 @@ static u16 rtw_get_rsvd_page_probe_req_size(struct rtw_dev *rtwdev,
if (rsvd_pkt->type != RSVD_PROBE_REQ) if (rsvd_pkt->type != RSVD_PROBE_REQ)
continue; continue;
if ((!ssid && !rsvd_pkt->ssid) || 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; size = rsvd_pkt->probe_req_size;
} }
......
...@@ -2090,18 +2090,6 @@ static inline struct ieee80211_vif *rtwvif_to_vif(struct rtw_vif *rtwvif) ...@@ -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); 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) static inline void rtw_chip_efuse_grant_on(struct rtw_dev *rtwdev)
{ {
if (rtwdev->chip->ops->efuse_grant) if (rtwdev->chip->ops->efuse_grant)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment