From fe7931a48677470a44e5f772bea2477362ae5552 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 2 Mar 2011 21:18:40 +0100 Subject: [PATCH] --- yaml --- r: 236219 b: refs/heads/master c: 9d7326f97ee5abf0e20548a2d3ed94d5a4fddd0c h: refs/heads/master i: 236217: 81f0a050f79579e9f1c59ee701c8d9b7425ba118 236215: 068ffcb76e73fbcc28a397fa8083bc001b607ce2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 539b1a4024f2..8cb413433b23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 228a00f8dcd34fdead86c8b4d31552e69ab9b9e4 +refs/heads/master: 9d7326f97ee5abf0e20548a2d3ed94d5a4fddd0c diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c index 3a53d5b76e9d..9224961f6836 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -5723,8 +5723,8 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw, d11txh_t *txh; u8 *plcp, plcp_fallback[D11_PHY_HDR_LEN]; int len, phylen, rts_phylen; - u16 frameid, mch, phyctl, xfts, mainrates; - u16 seq = 0, mcl = 0, status = 0; + u16 mch, phyctl, xfts, mainrates; + u16 seq = 0, mcl = 0, status = 0, frameid = 0; ratespec_t rspec[2] = { WLC_RATE_1M, WLC_RATE_1M }, rts_rspec[2] = { WLC_RATE_1M, WLC_RATE_1M}; bool use_rts = false; @@ -5752,8 +5752,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw, u16 mimo_txbw; u8 mimo_preamble_type; - frameid = 0; - ASSERT(queue < NFIFO); /* locate 802.11 MAC header */