diff --git a/[refs] b/[refs]
index bb4edf4a7520..90c67dd00db3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a844855344b035338bfbcb1d2b7ed0aaca241a95
+refs/heads/master: 05ef54e8cd7d5d29b263ead74191e5b96c24618d
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;