From 875fcee9a9adf3dffef5b621e733592be25c5635 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Tue, 2 Jun 2009 15:43:25 -0700
Subject: [PATCH] --- yaml --- r: 150692 b: refs/heads/master c:
 894df1cbc376310163d41c50c891db41296056bf h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dca8e0fcdc30..638804542f78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e189a12c246f55fe087efe345fe5f4cbe0be545
+refs/heads/master: 894df1cbc376310163d41c50c891db41296056bf
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index a910148b8228..1436f747531a 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1238,7 +1238,6 @@ static void ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
 			 bool txpending)
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-	struct sta_info *sta;
 	struct ieee80211_tx_data tx;
 	ieee80211_tx_result res_prepare;
 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -1270,7 +1269,6 @@ static void ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
 		return;
 	}
 
-	sta = tx.sta;
 	tx.channel = local->hw.conf.channel;
 	info->band = tx.channel->band;