diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-09-27 22:58:18 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-06 18:14:55 -0400 |
| commit | 8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8 (patch) | |
| tree | 1a03b6ebd608bbf15fcaf955b0a607b1a7b90dfd /net/mac80211/tx.c | |
| parent | 74af025073461b9ebe82771e48a5b8596c3cf75c (diff) | |
| download | kernel_samsung_tuna-8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8.zip kernel_samsung_tuna-8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8.tar.gz kernel_samsung_tuna-8ef9dad3f7c0bdae84cd57f2bc6d4f53421406a8.tar.bz2 | |
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 0cc2e23..226ce77 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; |