wifi: mwifiex: use cfg80211_ssid_eq() instead of mwifiex_ssid_cmp()

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

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

diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c
index a6e254a1185c105bf4972d48ec205e35ceb9d431..9d98a1908dd603176ed55d52dee8b21736736996 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/join.c
+++ b/drivers/net/wireless/marvell/mwifiex/join.c
@@ -1427,8 +1427,8 @@ int mwifiex_adhoc_join(struct mwifiex_private *priv,
 
        /* Check if the requested SSID is already joined */
        if (priv->curr_bss_params.bss_descriptor.ssid.ssid_len &&
-           !mwifiex_ssid_cmp(&bss_desc->ssid,
-                             &priv->curr_bss_params.bss_descriptor.ssid) &&
+           cfg80211_ssid_eq(&bss_desc->ssid,
+                            &priv->curr_bss_params.bss_descriptor.ssid) &&
            (priv->curr_bss_params.bss_descriptor.bss_mode ==
                                                        NL80211_IFTYPE_ADHOC)) {
                mwifiex_dbg(priv->adapter, INFO,

diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index d263eae6078c22e681f12db86af904e7cbeedcc4..318b42b1896f893c9feec5525fd8d86386eec443 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -1152,7 +1152,6 @@ void mwifiex_queue_scan_cmd(struct mwifiex_private *priv,
                            struct cmd_ctrl_node *cmd_node);
 int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                            struct host_cmd_ds_command *resp);
-s32 mwifiex_ssid_cmp(struct cfg80211_ssid *ssid1, struct cfg80211_ssid *ssid2);
 int mwifiex_associate(struct mwifiex_private *priv,
                      struct mwifiex_bssdescriptor *bss_desc);
 int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,

diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index 72904c275461e659fe30e8b715dfc7d20a1dc5d1..a2ddac363b1005f1b2863f5721a476d181273421 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -179,17 +179,6 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
        return ret;
 }
 
-/*
- * This function compares two SSIDs and checks if they match.
- */
-s32
-mwifiex_ssid_cmp(struct cfg80211_ssid *ssid1, struct cfg80211_ssid *ssid2)
-{
-       if (!ssid1 || !ssid2 || (ssid1->ssid_len != ssid2->ssid_len))
-               return -1;
-       return memcmp(ssid1->ssid, ssid2->ssid, ssid1->ssid_len);
-}
-
 /*
  * This function checks if wapi is enabled in driver and scanned network is
  * compatible with it.

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index a2ad2b53f016833fddbd839452ca33e195b0017c..32a27fad7b79a9f67a15ab2161f3a26145d5ea57 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -345,8 +345,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                /* Adhoc mode */
                /* If the requested SSID matches current SSID, return */
                if (bss_desc && bss_desc->ssid.ssid_len &&
-                   (!mwifiex_ssid_cmp(&priv->curr_bss_params.bss_descriptor.
-                                      ssid, &bss_desc->ssid))) {
+                   cfg80211_ssid_eq(&priv->curr_bss_params.bss_descriptor.ssid,
+                                    &bss_desc->ssid)) {
                        ret = 0;
                        goto done;
                }