[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1368460038-21195-170-git-send-email-jogreene@redhat.com>
Date: Mon, 13 May 2013 11:47:11 -0400
From: John Greene <jogreene@...hat.com>
To: rhkernel-list@...hat.com
Cc: John Greene <jogreene@...hat.com>,
Brett Rudley <brudley@...adcom.com>,
Arend van Spriel <arend@...adcom.com>,
"Franky (Zhenhui) Lin" <frankyl@...adcom.com>,
Hante Meuleman <meuleman@...adcom.com>,
"John W. Linville" <linville@...driver.com>,
Pieter-Paul Giesberts <pieterpg@...adcom.com>,
Seth Forshee <seth.forshee@...onical.com>,
Hauke Mehrtens <hauke@...ke-m.de>,
linux-wireless@...r.kernel.org, brcm80211-dev-list@...adcom.com,
netdev@...r.kernel.org, Tim Gardner <tim.gardner@...onical.com>
Subject: [RHEL 6.5 PATCH 169/176] brcmsmac: fix u16 overflow warning
Bugzilla: 757944
Brew: <https://brewweb.devel.redhat.com/taskinfo?taskID=5738553>
Upstream Status: 708eb54f20334470ad92042547db0fef0cd60462
Tested: By me. Acceptable. See BZ for details
DOT11_MIN_BEACON_PERIOD and DOT11_MAX_BEACON_PERIOD are
superfluous. The only invalid beacon period is 0. Comparing
a 16 bit quantity to 0xffff also causes a compile warning:
drivers/net/wireless/brcm80211/brcmsmac/main.c:5560 brcms_c_set_beacon_period()
warn: impossible condition '(period > 65535) => (0-65535 > 65535)'
Observed from smatch analysis.
Cc: Brett Rudley <brudley@...adcom.com>
Cc: Arend van Spriel <arend@...adcom.com>
Cc: "Franky (Zhenhui) Lin" <frankyl@...adcom.com>
Cc: Hante Meuleman <meuleman@...adcom.com>
Cc: "John W. Linville" <linville@...driver.com>
Cc: Pieter-Paul Giesberts <pieterpg@...adcom.com>
Cc: Seth Forshee <seth.forshee@...onical.com>
Cc: Hauke Mehrtens <hauke@...ke-m.de>
Cc: linux-wireless@...r.kernel.org
Cc: brcm80211-dev-list@...adcom.com
Cc: netdev@...r.kernel.org
Signed-off-by: Tim Gardner <tim.gardner@...onical.com>
Acked-by: Arend van Spriel <arend@...adcom.com>
Signed-off-by: John W. Linville <linville@...driver.com>
---
drivers/net/wireless/brcm80211/brcmsmac/main.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 5c50b79..c72fbab 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -101,8 +101,6 @@
#define DOT11_RTS_LEN 16
#define DOT11_CTS_LEN 10
#define DOT11_BA_BITMAP_LEN 128
-#define DOT11_MIN_BEACON_PERIOD 1
-#define DOT11_MAX_BEACON_PERIOD 0xFFFF
#define DOT11_MAXNUMFRAGS 16
#define DOT11_MAX_FRAG_LEN 2346
@@ -5548,8 +5546,7 @@ int brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcm_rateset *rs)
int brcms_c_set_beacon_period(struct brcms_c_info *wlc, u16 period)
{
- if (period < DOT11_MIN_BEACON_PERIOD ||
- period > DOT11_MAX_BEACON_PERIOD)
+ if (period == 0)
return -EINVAL;
wlc->default_bss->beacon_period = period;
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists