lkml.org 
[lkml]   [2017]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 4/4] Staging: rtl8712: ieee80211:fixed warning line over 80 characters coding style issue
From
Date
On Tue, 2017-05-09 at 00:52 +0530, Jaya Durga wrote:
> fixed warning line over 80 characters coding style issue
>
> Signed-off-by: Jaya Durga <jayad@cdac.in>
> ---
> drivers/staging/rtl8712/ieee80211.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8712/ieee80211.c b/drivers/staging/rtl8712/ieee80211.c
> index 42cb46c..a7152df 100644
> --- a/drivers/staging/rtl8712/ieee80211.c
> +++ b/drivers/staging/rtl8712/ieee80211.c
> @@ -222,7 +222,9 @@ unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)
> pbuf = r8712_get_ie(pbuf, _WPA_IE_ID_, &len, limit);
> if (pbuf) {
> /*check if oui matches...*/
> - if (memcmp((pbuf + 2), wpa_oui_type, sizeof(wpa_oui_type)))
> + if (memcmp(
> + (pbuf + 2), wpa_oui_type,
> + sizeof(wpa_oui_type)))
> goto check_next_ie;
> /*check version...*/
> memcpy((u8 *)&val16, (pbuf + 6), sizeof(val16));

This is a oddly written function.
Perhaps something like this would be more obvious:

unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)
{
u8 *pbuf = pie;

while (1) {
int len;

pbuf = r8712_get_ie(pbuf, _WPA_IE_ID_, &len, limit);
if (!pbuf)
break;
/* check if oui matches... */
if (memcmp(pbuf + 2, WPA_OUI_TYPE, sizeof(WPA_OUI_TYPE)) == 0 &&
    get_unaligned_le16(pbuf + 6) == 0x0001) {
*wpa_ie_len = *(pbuf + 1);
return pbuf;
}
limit = limit - (pbuf - pie) - 2 - len;
if (limit <= 0)
break;
pbuf += 2 + len;
}

*wpa_ie_len = 0;
return NULL;
}

\
 
 \ /
  Last update: 2017-05-10 21:18    [W:0.036 / U:4.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site