From c2192cb54a40ec6404dbe5b458e1936aa9adf305 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sat, 27 Sep 2008 22:58:18 +0300
Subject: [PATCH] --- yaml --- r: 112043 b: refs/heads/master c:
 8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8 h: refs/heads/master i:   112041:
 4e4dba0215b79664dff565fa36a0381f9220e6af   112039:
 48631d49d2d1fefe3a19f79263a1b45918a68463 v: v3

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

diff --git a/[refs] b/[refs]
index 571d7443fdb8..81384b0dd107 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74af025073461b9ebe82771e48a5b8596c3cf75c
+refs/heads/master: 8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 0cc2e23f082c..226ce77363d7 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1255,8 +1255,7 @@ static int ieee80211_skb_resize(struct ieee80211_local *local,
 	return 0;
 }
 
-int ieee80211_master_start_xmit(struct sk_buff *skb,
-				struct net_device *dev)
+int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct ieee80211_master_priv *mpriv = netdev_priv(dev);
 	struct ieee80211_local *local = mpriv->local;
@@ -1308,8 +1307,6 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
 		}
 	} else if (unlikely(osdata->vif.type == NL80211_IFTYPE_MONITOR)) {
 		struct ieee80211_sub_if_data *sdata;
-		struct ieee80211_local *local = osdata->local;
-		struct ieee80211_hdr *hdr;
 		int hdrlen;
 		u16 len_rthdr;