Commit 57e2936e authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename RTLLIB_LINKED_SCANNING

Rename RTLLIB_LINKED_SCANNING to MAC80211_LINKED_SCANNING to align with
rtlwifi driver.
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/25b97cd436c636e750c50f0c03386fcc46e56610.1687007788.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2445e3a5
...@@ -28,7 +28,7 @@ static u32 _rtl92e_ethtool_get_link(struct net_device *dev) ...@@ -28,7 +28,7 @@ static u32 _rtl92e_ethtool_get_link(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
return ((priv->rtllib->link_state == MAC80211_LINKED) || 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 = { const struct ethtool_ops rtl819x_ethtool_ops = {
......
...@@ -1153,7 +1153,7 @@ enum rtl_link_state { ...@@ -1153,7 +1153,7 @@ enum rtl_link_state {
* logically linked, but it is doing a syncro site survey * logically linked, but it is doing a syncro site survey
* then it will be back to LINKED state. * then it will be back to LINKED state.
*/ */
RTLLIB_LINKED_SCANNING, MAC80211_LINKED_SCANNING,
}; };
#define DEFAULT_MAX_SCAN_AGE (15 * HZ) #define DEFAULT_MAX_SCAN_AGE (15 * HZ)
......
...@@ -513,7 +513,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh) ...@@ -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 * will set the state to MAC80211_LINKED, so we stop
* scanning * scanning
* 2- We are linked and the root uses run iwlist scan. * 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 * that we are still logically linked (not interested in
* new network events, despite for updating the net list, * new network events, despite for updating the net list,
* but we are temporarly 'unlinked' as the driver shall * but we are temporarly 'unlinked' as the driver shall
......
...@@ -96,7 +96,7 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee, ...@@ -96,7 +96,7 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee,
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
if (ieee->link_state != MAC80211_LINKED && if (ieee->link_state != MAC80211_LINKED &&
ieee->link_state != RTLLIB_LINKED_SCANNING && ieee->link_state != MAC80211_LINKED_SCANNING &&
ieee->wap_set == 0) ieee->wap_set == 0)
eth_zero_addr(wrqu->ap_addr.sa_data); 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, ...@@ -185,7 +185,7 @@ int rtllib_wx_get_essid(struct rtllib_device *ieee, struct iw_request_info *a,
} }
if (ieee->link_state != MAC80211_LINKED && if (ieee->link_state != MAC80211_LINKED &&
ieee->link_state != RTLLIB_LINKED_SCANNING && ieee->link_state != MAC80211_LINKED_SCANNING &&
ieee->ssid_set == 0) { ieee->ssid_set == 0) {
ret = -1; ret = -1;
goto out; goto out;
...@@ -323,7 +323,7 @@ void rtllib_wx_sync_scan_wq(void *data) ...@@ -323,7 +323,7 @@ void rtllib_wx_sync_scan_wq(void *data)
rtllib_stop_all_queues(ieee); rtllib_stop_all_queues(ieee);
rtllib_stop_send_beacons(ieee); rtllib_stop_send_beacons(ieee);
ieee->link_state = RTLLIB_LINKED_SCANNING; ieee->link_state = MAC80211_LINKED_SCANNING;
ieee->link_change(ieee->dev); ieee->link_change(ieee->dev);
/* wait for ps packet to be kicked out successfully */ /* wait for ps packet to be kicked out successfully */
msleep(50); msleep(50);
......
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