Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtlwifi: Fix static checker warnings for various drivers

Indenting errors yielded the following static checker warnings:

drivers/net/wireless/rtlwifi/rtl8192ee/hw.c:533 rtl92ee_set_hw_reg() warn: add curly braces? (if)
drivers/net/wireless/rtlwifi/rtl8192ee/hw.c:539 rtl92ee_set_hw_reg() warn: add curly braces? (if)

An unreleased version of the static checker also reported:

drivers/net/wireless/rtlwifi/rtl8723be/trx.c:550 rtl8723be_rx_query_desc() warn: 'hdr' can't be NULL.
drivers/net/wireless/rtlwifi/rtl8188ee/trx.c:621 rtl88ee_rx_query_desc() warn: 'hdr' can't be NULL.
drivers/net/wireless/rtlwifi/rtl8192ee/trx.c:567 rtl92ee_rx_query_desc() warn: 'hdr' can't be NULL.
drivers/net/wireless/rtlwifi/rtl8821ae/trx.c:758 rtl8821ae_rx_query_desc() warn: 'hdr' can't be NULL.
drivers/net/wireless/rtlwifi/rtl8723ae/trx.c:494 rtl8723e_rx_query_desc() warn: 'hdr' can't be NULL.
drivers/net/wireless/rtlwifi/rtl8192se/trx.c:315 rtl92se_rx_query_desc() warn: 'hdr' can't be NULL.
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c:392 rtl92ce_rx_query_desc() warn: 'hdr' can't be NULL.

All of these are fixed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Larry Finger and committed by
John W. Linville
3f08e472 989377e1

+12 -54
-7
drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
··· 618 618 * to decrypt it 619 619 */ 620 620 if (status->decrypted) { 621 - if (!hdr) { 622 - WARN_ON_ONCE(true); 623 - pr_err("decrypted is true but hdr NULL, from skb %p\n", 624 - rtl_get_hdr(skb)); 625 - return false; 626 - } 627 - 628 621 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) && 629 622 (ieee80211_has_protected(hdr->frame_control))) 630 623 rx_status->flag |= RX_FLAG_DECRYPTED;
-4
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
··· 389 389 * to decrypt it 390 390 */ 391 391 if (stats->decrypted) { 392 - if (!hdr) { 393 - /* In testing, hdr was NULL here */ 394 - return false; 395 - } 396 392 if ((_ieee80211_is_robust_mgmt_frame(hdr)) && 397 393 (ieee80211_has_protected(hdr->frame_control))) 398 394 rx_status->flag &= ~RX_FLAG_DECRYPTED;
+12 -12
drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
··· 530 530 fac = (1 << (fac + 2)); 531 531 if (fac > 0xf) 532 532 fac = 0xf; 533 - for (i = 0; i < 4; i++) { 534 - if ((reg[i] & 0xf0) > (fac << 4)) 535 - reg[i] = (reg[i] & 0x0f) | 536 - (fac << 4); 537 - if ((reg[i] & 0x0f) > fac) 538 - reg[i] = (reg[i] & 0xf0) | fac; 539 - rtl_write_byte(rtlpriv, 540 - (REG_AGGLEN_LMT + i), 541 - reg[i]); 542 - } 543 - RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 544 - "Set HW_VAR_AMPDU_FACTOR:%#x\n", fac); 533 + for (i = 0; i < 4; i++) { 534 + if ((reg[i] & 0xf0) > (fac << 4)) 535 + reg[i] = (reg[i] & 0x0f) | 536 + (fac << 4); 537 + if ((reg[i] & 0x0f) > fac) 538 + reg[i] = (reg[i] & 0xf0) | fac; 539 + rtl_write_byte(rtlpriv, 540 + (REG_AGGLEN_LMT + i), 541 + reg[i]); 542 + } 543 + RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 544 + "Set HW_VAR_AMPDU_FACTOR:%#x\n", fac); 545 545 } 546 546 } 547 547 break;
-7
drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
··· 564 564 * to decrypt it 565 565 */ 566 566 if (status->decrypted) { 567 - if (!hdr) { 568 - WARN_ON_ONCE(true); 569 - pr_err("decrypted is true but hdr NULL, from skb %p\n", 570 - rtl_get_hdr(skb)); 571 - return false; 572 - } 573 - 574 567 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) && 575 568 (ieee80211_has_protected(hdr->frame_control))) 576 569 rx_status->flag |= RX_FLAG_DECRYPTED;
-4
drivers/net/wireless/rtlwifi/rtl8192se/trx.c
··· 312 312 hdr = (struct ieee80211_hdr *)(skb->data + 313 313 stats->rx_drvinfo_size + stats->rx_bufshift); 314 314 315 - if (!hdr) { 316 - /* during testing, hdr was NULL here */ 317 - return false; 318 - } 319 315 if ((_ieee80211_is_robust_mgmt_frame(hdr)) && 320 316 (ieee80211_has_protected(hdr->frame_control))) 321 317 rx_status->flag &= ~RX_FLAG_DECRYPTED;
-6
drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
··· 491 491 * to decrypt it 492 492 */ 493 493 if (status->decrypted) { 494 - if (!hdr) { 495 - WARN_ON_ONCE(true); 496 - pr_err("decrypted is true but hdr NULL, from skb %p\n", 497 - rtl_get_hdr(skb)); 498 - return false; 499 - } 500 494 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) && 501 495 (ieee80211_has_protected(hdr->frame_control))) 502 496 rx_status->flag |= RX_FLAG_DECRYPTED;
-7
drivers/net/wireless/rtlwifi/rtl8723be/trx.c
··· 547 547 * to decrypt it 548 548 */ 549 549 if (status->decrypted) { 550 - if (!hdr) { 551 - WARN_ON_ONCE(true); 552 - pr_err("decrypted is true but hdr NULL, from skb %p\n", 553 - rtl_get_hdr(skb)); 554 - return false; 555 - } 556 - 557 550 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) && 558 551 (ieee80211_has_protected(hdr->frame_control))) 559 552 rx_status->flag |= RX_FLAG_DECRYPTED;
-7
drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
··· 755 755 * to decrypt it 756 756 */ 757 757 if (status->decrypted) { 758 - if (!hdr) { 759 - WARN_ON_ONCE(true); 760 - pr_err("decrypted is true but hdr NULL, from skb %p\n", 761 - rtl_get_hdr(skb)); 762 - return false; 763 - } 764 - 765 758 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) && 766 759 (ieee80211_has_protected(hdr->frame_control))) 767 760 rx_status->flag |= RX_FLAG_DECRYPTED;