---

yaml --- r: 236219 b: refs/heads/master c: 9d7326f h: refs/heads/master i: 236217: 81f0a05 236215: 068ffcb v: v3
git-mirror · Mar 3, 2011 · fe7931a · fe7931a
1 parent 7d5bd6d
commit fe7931a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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 */