staging: rtl8192e: Rename RTLLIB_LINKED_SCANNING

Rename RTLLIB_LINKED_SCANNING to MAC80211_LINKED_SCANNING to align with
rtlwifi driver.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/25b97cd436c636e750c50f0c03386fcc46e56610.1687007788.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c
index 1625d1326599743b379ad6ccce522e9e6977d4d7..fab8932e67dae5116a74a56a7388567e56e78b4c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c
@@ -28,7 +28,7 @@ static u32 _rtl92e_ethtool_get_link(struct net_device *dev)
        struct r8192_priv *priv = rtllib_priv(dev);
 
        return ((priv->rtllib->link_state == MAC80211_LINKED) ||
-               (priv->rtllib->link_state == RTLLIB_LINKED_SCANNING));
+               (priv->rtllib->link_state == MAC80211_LINKED_SCANNING));
 }
 
 const struct ethtool_ops rtl819x_ethtool_ops = {

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 7758bfd902837fb614218c01d162cead70eaf5e9..cdd167de127f71b86f490d74172c50c625e93ba6 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1153,7 +1153,7 @@ enum rtl_link_state {
         * logically linked, but it is doing a syncro site survey
         * then it will be back to LINKED state.
         */
-       RTLLIB_LINKED_SCANNING,
+       MAC80211_LINKED_SCANNING,
 };
 
 #define DEFAULT_MAX_SCAN_AGE (15 * HZ)

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index d99b98a39cc759e8c1e7a3f3e4934a871a6e3c06..7494c7e6fff67b00ae2e97b550e68d675822e996 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -513,7 +513,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
                 *    will set the state to MAC80211_LINKED, so we stop
                 *    scanning
                 * 2- We are linked and the root uses run iwlist scan.
-                *    So we switch to RTLLIB_LINKED_SCANNING to remember
+                *    So we switch to MAC80211_LINKED_SCANNING to remember
                 *    that we are still logically linked (not interested in
                 *    new network events, despite for updating the net list,
                 *    but we are temporarly 'unlinked' as the driver shall

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index c1d1bf4d720aa6cf89083a757f6f779f9e8b2e96..be82f0a655e886a736f1f1211eed82e26082602d 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -96,7 +96,7 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee,
        spin_lock_irqsave(&ieee->lock, flags);
 
        if (ieee->link_state != MAC80211_LINKED &&
-               ieee->link_state != RTLLIB_LINKED_SCANNING &&
+               ieee->link_state != MAC80211_LINKED_SCANNING &&
                ieee->wap_set == 0)
 
                eth_zero_addr(wrqu->ap_addr.sa_data);
@@ -185,7 +185,7 @@ int rtllib_wx_get_essid(struct rtllib_device *ieee, struct iw_request_info *a,
        }
 
        if (ieee->link_state != MAC80211_LINKED &&
-               ieee->link_state != RTLLIB_LINKED_SCANNING &&
+               ieee->link_state != MAC80211_LINKED_SCANNING &&
                ieee->ssid_set == 0) {
                ret = -1;
                goto out;
@@ -323,7 +323,7 @@ void rtllib_wx_sync_scan_wq(void *data)
 
        rtllib_stop_all_queues(ieee);
        rtllib_stop_send_beacons(ieee);
-       ieee->link_state = RTLLIB_LINKED_SCANNING;
+       ieee->link_state = MAC80211_LINKED_SCANNING;
        ieee->link_change(ieee->dev);
        /* wait for ps packet to be kicked out successfully */
        msleep(50);