evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8192e: Divide rtllib_rx_auth()

Browse source 
Move authentication response processing to rtllib_rx_auth_resp() function.
No logic is affected.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-04-01 00:24:34 +02:00 • committed by Greg Kroah-Hartman
parent 61dbdf36f2
commit e8f05b0b01
1 changed files with 61 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/rtl8192e/rtllib_softmac.c
View file

@ -2314,19 +2314,13 @@ inline int rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
return 0; return 0;
} }
inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb, static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)
struct rtllib_rx_stats *rx_stats)
{ {
u16 errcode; u16 errcode;
u8 *challenge; u8 *challenge;
int chlen = 0; int chlen = 0;
bool bSupportNmode = true, bHalfSupportNmode = false; bool bSupportNmode = true, bHalfSupportNmode = false;
if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) {
if (ieee->state == RTLLIB_ASSOCIATING_AUTHENTICATING &&
(ieee->iw_mode == IW_MODE_INFRA)) {
RTLLIB_DEBUG_MGMT("Received authentication response");
errcode = auth_parse(skb, &challenge, &chlen); errcode = auth_parse(skb, &challenge, &chlen);
if (0 == errcode) { if (0 == errcode) {
if (ieee->open_wep || !challenge) { if (ieee->open_wep || !challenge) {
@ -2380,7 +2374,17 @@ inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
errcode); errcode);
rtllib_associate_abort(ieee); rtllib_associate_abort(ieee);
} }
}
inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats)
{
if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) {
if (ieee->state == RTLLIB_ASSOCIATING_AUTHENTICATING &&
(ieee->iw_mode == IW_MODE_INFRA)) {
RTLLIB_DEBUG_MGMT("Received authentication response");
rtllib_rx_auth_resp(ieee, skb);
} else if (ieee->iw_mode == IW_MODE_MASTER) { } else if (ieee->iw_mode == IW_MODE_MASTER) {
rtllib_rx_auth_rq(ieee, skb); rtllib_rx_auth_rq(ieee, skb);
} }