diff --git a/[refs] b/[refs]
index 589102246cac..8bd905bf226e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d
+refs/heads/master: cf00f379d82d170712150588accd2ebe316c2226
diff --git a/trunk/drivers/net/wireless/wl12xx/tx.c b/trunk/drivers/net/wireless/wl12xx/tx.c
index 36eb0d66fd66..7d727ee6ddf6 100644
--- a/trunk/drivers/net/wireless/wl12xx/tx.c
+++ b/trunk/drivers/net/wireless/wl12xx/tx.c
@@ -285,7 +285,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 	struct wl1271_tx_hw_descr *desc;
 	int aligned_len, ac, rate_idx;
 	s64 hosttime;
-	u16 tx_attr;
+	u16 tx_attr = 0;
 	bool is_dummy;
 
 	desc = (struct wl1271_tx_hw_descr *) skb->data;