Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f08e472 authored Oct 02, 2014 by Larry Finger Committed by John W. Linville Oct 02, 2014

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>

parent 989377e1

drivers/net/wireless/rtlwifi/rtl8188ee/trx.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -618,13 +618,6 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
		* to decrypt it
		*/
		if (status->decrypted) {
		if (!hdr) {
		WARN_ON_ONCE(true);
		pr_err("decrypted is true but hdr NULL, from skb %p\n",
		rtl_get_hdr(skb));
		return false;
		}

		if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
		(ieee80211_has_protected(hdr->frame_control)))
		rx_status->flag \|= RX_FLAG_DECRYPTED;

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -389,10 +389,6 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
		* to decrypt it
		*/
		if (stats->decrypted) {
		if (!hdr) {
		/* In testing, hdr was NULL here */
		return false;
		}
		if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
		(ieee80211_has_protected(hdr->frame_control)))
		rx_status->flag &= ~RX_FLAG_DECRYPTED;

drivers/net/wireless/rtlwifi/rtl8192ee/trx.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -564,13 +564,6 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
		* to decrypt it
		*/
		if (status->decrypted) {
		if (!hdr) {
		WARN_ON_ONCE(true);
		pr_err("decrypted is true but hdr NULL, from skb %p\n",
		rtl_get_hdr(skb));
		return false;
		}

		if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
		(ieee80211_has_protected(hdr->frame_control)))
		rx_status->flag \|= RX_FLAG_DECRYPTED;

drivers/net/wireless/rtlwifi/rtl8192se/trx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -312,10 +312,6 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw hw, struct rtl_stats stats,
		hdr = (struct ieee80211_hdr *)(skb->data +
		stats->rx_drvinfo_size + stats->rx_bufshift);

		if (!hdr) {
		/* during testing, hdr was NULL here */
		return false;
		}
		if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
		(ieee80211_has_protected(hdr->frame_control)))
		rx_status->flag &= ~RX_FLAG_DECRYPTED;

drivers/net/wireless/rtlwifi/rtl8723ae/trx.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -491,12 +491,6 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
		* to decrypt it
		*/
		if (status->decrypted) {
		if (!hdr) {
		WARN_ON_ONCE(true);
		pr_err("decrypted is true but hdr NULL, from skb %p\n",
		rtl_get_hdr(skb));
		return false;
		}
		if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
		(ieee80211_has_protected(hdr->frame_control)))
		rx_status->flag \|= RX_FLAG_DECRYPTED;