Skip to content

Commit 57e2936

Browse files
Philipp Hortmanngregkh
authored andcommitted
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>
1 parent 2445e3a commit 57e2936

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static u32 _rtl92e_ethtool_get_link(struct net_device *dev)
2828
struct r8192_priv *priv = rtllib_priv(dev);
2929

3030
return ((priv->rtllib->link_state == MAC80211_LINKED) ||
31-
(priv->rtllib->link_state == RTLLIB_LINKED_SCANNING));
31+
(priv->rtllib->link_state == MAC80211_LINKED_SCANNING));
3232
}
3333

3434
const struct ethtool_ops rtl819x_ethtool_ops = {

drivers/staging/rtl8192e/rtllib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ enum rtl_link_state {
11531153
* logically linked, but it is doing a syncro site survey
11541154
* then it will be back to LINKED state.
11551155
*/
1156-
RTLLIB_LINKED_SCANNING,
1156+
MAC80211_LINKED_SCANNING,
11571157
};
11581158

11591159
#define DEFAULT_MAX_SCAN_AGE (15 * HZ)

drivers/staging/rtl8192e/rtllib_softmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
513513
* will set the state to MAC80211_LINKED, so we stop
514514
* scanning
515515
* 2- We are linked and the root uses run iwlist scan.
516-
* So we switch to RTLLIB_LINKED_SCANNING to remember
516+
* So we switch to MAC80211_LINKED_SCANNING to remember
517517
* that we are still logically linked (not interested in
518518
* new network events, despite for updating the net list,
519519
* but we are temporarly 'unlinked' as the driver shall

drivers/staging/rtl8192e/rtllib_softmac_wx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee,
9696
spin_lock_irqsave(&ieee->lock, flags);
9797

9898
if (ieee->link_state != MAC80211_LINKED &&
99-
ieee->link_state != RTLLIB_LINKED_SCANNING &&
99+
ieee->link_state != MAC80211_LINKED_SCANNING &&
100100
ieee->wap_set == 0)
101101

102102
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,
185185
}
186186

187187
if (ieee->link_state != MAC80211_LINKED &&
188-
ieee->link_state != RTLLIB_LINKED_SCANNING &&
188+
ieee->link_state != MAC80211_LINKED_SCANNING &&
189189
ieee->ssid_set == 0) {
190190
ret = -1;
191191
goto out;
@@ -323,7 +323,7 @@ void rtllib_wx_sync_scan_wq(void *data)
323323

324324
rtllib_stop_all_queues(ieee);
325325
rtllib_stop_send_beacons(ieee);
326-
ieee->link_state = RTLLIB_LINKED_SCANNING;
326+
ieee->link_state = MAC80211_LINKED_SCANNING;
327327
ieee->link_change(ieee->dev);
328328
/* wait for ps packet to be kicked out successfully */
329329
msleep(50);

0 commit comments

Comments
 (0)