---

yaml --- r: 112043 b: refs/heads/master c: 8ef9dad h: refs/heads/master i: 112041: 4e4dba0 112039: 48631d4 v: v3
git-mirror · Oct 6, 2008 · c2192cb · c2192cb
1 parent 37f1f88
commit c2192cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;