mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
staging: rtl8712: fix some confusing indenting
These set off a static checker warning about "warn: add curly braces?", but actually the code it correct, it's just the indenting which is wrong. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
88fa1ebfa2
commit
879cb0c986
2 changed files with 10 additions and 9 deletions
|
@ -78,9 +78,9 @@ uint r8712_is_cckrates_included(u8 *rate)
|
||||||
if ((((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
|
if ((((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
|
||||||
(((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22))
|
(((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22))
|
||||||
return true;
|
return true;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint r8712_is_cckratesonly_included(u8 *rate)
|
uint r8712_is_cckratesonly_included(u8 *rate)
|
||||||
|
|
|
@ -1244,17 +1244,18 @@ static sint aes_decipher(u8 *key, uint hdrlen,
|
||||||
(frtype == WIFI_DATA_CFPOLL) ||
|
(frtype == WIFI_DATA_CFPOLL) ||
|
||||||
(frtype == WIFI_DATA_CFACKPOLL)) {
|
(frtype == WIFI_DATA_CFACKPOLL)) {
|
||||||
qc_exists = 1;
|
qc_exists = 1;
|
||||||
if (hdrlen != WLAN_HDR_A3_QOS_LEN)
|
if (hdrlen != WLAN_HDR_A3_QOS_LEN)
|
||||||
hdrlen += 2;
|
hdrlen += 2;
|
||||||
} else if ((frsubtype == 0x08) ||
|
} else if ((frsubtype == 0x08) ||
|
||||||
(frsubtype == 0x09) ||
|
(frsubtype == 0x09) ||
|
||||||
(frsubtype == 0x0a) ||
|
(frsubtype == 0x0a) ||
|
||||||
(frsubtype == 0x0b)) {
|
(frsubtype == 0x0b)) {
|
||||||
if (hdrlen != WLAN_HDR_A3_QOS_LEN)
|
if (hdrlen != WLAN_HDR_A3_QOS_LEN)
|
||||||
hdrlen += 2;
|
hdrlen += 2;
|
||||||
qc_exists = 1;
|
qc_exists = 1;
|
||||||
} else
|
} else {
|
||||||
qc_exists = 0;
|
qc_exists = 0;
|
||||||
|
}
|
||||||
/* now, decrypt pframe with hdrlen offset and plen long */
|
/* now, decrypt pframe with hdrlen offset and plen long */
|
||||||
payload_index = hdrlen + 8; /* 8 is for extiv */
|
payload_index = hdrlen + 8; /* 8 is for extiv */
|
||||||
for (i = 0; i < num_blocks; i++) {
|
for (i = 0; i < num_blocks; i++) {
|
||||||
|
|
Loading…
Reference in a new issue