aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-09-27 15:58:18 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-06 18:14:55 -0400
commit8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8 (patch)
tree1a03b6ebd608bbf15fcaf955b0a607b1a7b90dfd /net/mac80211/tx.c
parent74af025073461b9ebe82771e48a5b8596c3cf75c (diff)
mac80211: remove shadowed variables in ieee80211_master_start_xmit
This patch removes doubly defined variables in ieee80211_master_start_xmit Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 0cc2e23f082c..226ce77363d7 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1255,8 +1255,7 @@ static int ieee80211_skb_resize(struct ieee80211_local *local,
1255 return 0; 1255 return 0;
1256} 1256}
1257 1257
1258int ieee80211_master_start_xmit(struct sk_buff *skb, 1258int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
1259 struct net_device *dev)
1260{ 1259{
1261 struct ieee80211_master_priv *mpriv = netdev_priv(dev); 1260 struct ieee80211_master_priv *mpriv = netdev_priv(dev);
1262 struct ieee80211_local *local = mpriv->local; 1261 struct ieee80211_local *local = mpriv->local;
@@ -1308,8 +1307,6 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
1308 } 1307 }
1309 } else if (unlikely(osdata->vif.type == NL80211_IFTYPE_MONITOR)) { 1308 } else if (unlikely(osdata->vif.type == NL80211_IFTYPE_MONITOR)) {
1310 struct ieee80211_sub_if_data *sdata; 1309 struct ieee80211_sub_if_data *sdata;
1311 struct ieee80211_local *local = osdata->local;
1312 struct ieee80211_hdr *hdr;
1313 int hdrlen; 1310 int hdrlen;
1314 u16 len_rthdr; 1311 u16 len_rthdr;
1315 1312