Commit e92c3511 authored by Nitin Kuppelur's avatar Nitin Kuppelur Committed by Greg Kroah-Hartman

Staging: rtl8712:ieee80211 remove unnecessary else

Removed unnecessary else after return/break to solve
checkpatch.pl warning
Signed-off-by: default avatarNitin Kuppelur <nitinkuppelur@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 263bd1cb
...@@ -124,11 +124,10 @@ u8 *r8712_get_ie(u8 *pbuf, sint index, sint *len, sint limit) ...@@ -124,11 +124,10 @@ u8 *r8712_get_ie(u8 *pbuf, sint index, sint *len, sint limit)
if (*p == index) { if (*p == index) {
*len = *(p + 1); *len = *(p + 1);
return p; return p;
} else {
tmp = *(p + 1);
p += (tmp + 2);
i += (tmp + 2);
} }
tmp = *(p + 1);
p += (tmp + 2);
i += (tmp + 2);
if (i >= limit) if (i >= limit)
break; break;
} }
...@@ -237,10 +236,9 @@ unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit) ...@@ -237,10 +236,9 @@ unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)
goto check_next_ie; goto check_next_ie;
*wpa_ie_len = *(pbuf + 1); *wpa_ie_len = *(pbuf + 1);
return pbuf; return pbuf;
} else {
*wpa_ie_len = 0;
return NULL;
} }
*wpa_ie_len = 0;
return NULL;
check_next_ie: check_next_ie:
limit = limit - (pbuf - pie) - 2 - len; limit = limit - (pbuf - pie) - 2 - len;
if (limit <= 0) if (limit <= 0)
...@@ -414,7 +412,7 @@ int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) ...@@ -414,7 +412,7 @@ int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
cnt += in_ie[cnt+1]+2; cnt += in_ie[cnt+1]+2;
match = true; match = true;
break; break;
} else }
cnt += in_ie[cnt+1]+2; /* goto next */ cnt += in_ie[cnt+1]+2; /* goto next */
} }
return match; return match;
......
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