From c5ca053ea78988beff0c06dd1469ffd89f8658c3 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 31 Oct 2008 15:53:12 -0400
Subject: [PATCH] --- yaml --- r: 121752 b: refs/heads/master c:
 db4186cf15a5a7e8e8526f7c158f042ccc3ed576 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/p54/p54common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8dbc8ec6fa56..6674a8efa8eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5ea92a7528d304e8e327d0d261653e98b163e8a
+refs/heads/master: db4186cf15a5a7e8e8526f7c158f042ccc3ed576
diff --git a/trunk/drivers/net/wireless/p54/p54common.c b/trunk/drivers/net/wireless/p54/p54common.c
index 8423c430b71b..a2e2150403d2 100644
--- a/trunk/drivers/net/wireless/p54/p54common.c
+++ b/trunk/drivers/net/wireless/p54/p54common.c
@@ -1054,7 +1054,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
 	struct p54_common *priv = dev->priv;
 	struct p54_hdr *hdr;
 	struct p54_tx_data *txhdr;
-	size_t padding, len, tim_len;
+	size_t padding, len, tim_len = 0;
 	int i, j, ridx;
 	u16 hdr_flags = 0, aid = 0;
 	u8 rate, queue;