Commit 0c5d6ec4 authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman

Staging: rtl8192e: Rename variable asRsn

Rename variable asRsn to rsn to fix checkpatch warning
Avoid CamelCase, and adjust spacing to avoid alignment check.
Signed-off-by: default avatarTree Davies <tdavies@darkphysics.net>
Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20240227044157.407379-13-tdavies@darkphysics.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c6dc848
......@@ -1645,7 +1645,7 @@ int rtllib_rx_frame_softmac(struct rtllib_device *ieee, struct sk_buff *skb,
void rtllib_softmac_new_net(struct rtllib_device *ieee,
struct rtllib_network *net);
void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn);
void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 rsn);
void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee);
int rtllib_softmac_init(struct rtllib_device *ieee);
......@@ -1788,7 +1788,7 @@ static inline const char *escape_essid(const char *essid, u8 essid_len)
}
/* fun with the built-in rtllib stack... */
bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 asRsn);
bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 rsn);
/* For the function is more related to hardware setting, it's better to use the
* ieee handler to refer to it.
......
......@@ -2144,7 +2144,7 @@ void rtllib_softmac_free(struct rtllib_device *ieee)
static inline struct sk_buff *
rtllib_disauth_skb(struct rtllib_network *beacon,
struct rtllib_device *ieee, u16 asRsn)
struct rtllib_device *ieee, u16 rsn)
{
struct sk_buff *skb;
struct rtllib_disauth *disauth;
......@@ -2164,13 +2164,13 @@ rtllib_disauth_skb(struct rtllib_network *beacon,
ether_addr_copy(disauth->header.addr2, ieee->dev->dev_addr);
ether_addr_copy(disauth->header.addr3, beacon->bssid);
disauth->reason = cpu_to_le16(asRsn);
disauth->reason = cpu_to_le16(rsn);
return skb;
}
static inline struct sk_buff *
rtllib_disassociate_skb(struct rtllib_network *beacon,
struct rtllib_device *ieee, u16 asRsn)
struct rtllib_device *ieee, u16 rsn)
{
struct sk_buff *skb;
struct rtllib_disassoc *disass;
......@@ -2191,19 +2191,19 @@ rtllib_disassociate_skb(struct rtllib_network *beacon,
ether_addr_copy(disass->header.addr2, ieee->dev->dev_addr);
ether_addr_copy(disass->header.addr3, beacon->bssid);
disass->reason = cpu_to_le16(asRsn);
disass->reason = cpu_to_le16(rsn);
return skb;
}
void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn)
void send_disassociation(struct rtllib_device *ieee, bool deauth, u16 rsn)
{
struct rtllib_network *beacon = &ieee->current_network;
struct sk_buff *skb;
if (deauth)
skb = rtllib_disauth_skb(beacon, ieee, asRsn);
skb = rtllib_disauth_skb(beacon, ieee, rsn);
else
skb = rtllib_disassociate_skb(beacon, ieee, asRsn);
skb = rtllib_disassociate_skb(beacon, ieee, rsn);
if (skb)
softmac_mgmt_xmit(skb, ieee);
......@@ -2238,7 +2238,7 @@ u8 rtllib_ap_sec_type(struct rtllib_device *ieee)
}
static void rtllib_mlme_disassociate_request(struct rtllib_device *rtllib,
u8 *asSta, u8 asRsn)
u8 *asSta, u8 rsn)
{
u8 i;
u8 op_mode;
......@@ -2261,7 +2261,7 @@ static void rtllib_mlme_disassociate_request(struct rtllib_device *rtllib,
}
}
static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 asRsn)
static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 rsn)
{
bool filter_out_nonassociated_bssid = false;
......@@ -2269,19 +2269,19 @@ static void rtllib_mgnt_disconnect_ap(struct rtllib_device *rtllib, u8 asRsn)
rtllib->set_hw_reg_handler(rtllib->dev, HW_VAR_CECHK_BSSID,
(u8 *)(&filter_out_nonassociated_bssid));
rtllib_mlme_disassociate_request(rtllib, rtllib->current_network.bssid,
asRsn);
rsn);
rtllib->link_state = MAC80211_NOLINK;
}
bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 asRsn)
bool rtllib_mgnt_disconnect(struct rtllib_device *rtllib, u8 rsn)
{
if (rtllib->ps != RTLLIB_PS_DISABLED)
rtllib->sta_wake_up(rtllib->dev);
if (rtllib->link_state == MAC80211_LINKED) {
if (rtllib->iw_mode == IW_MODE_INFRA)
rtllib_mgnt_disconnect_ap(rtllib, asRsn);
rtllib_mgnt_disconnect_ap(rtllib, rsn);
}
return true;
......
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