From: Tomas Winkler Date: Sat, 27 Sep 2008 19:58:18 +0000 (+0300) Subject: mac80211: remove shadowed variables in ieee80211_master_start_xmit X-Git-Tag: v2.6.28-rc1~717^2~110^2~16 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: John W. Linville --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 0cc2e23f082..226ce77363d 100644 --- a/net/mac80211/tx.c +++ b/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;