Fixes following warning:-
drivers/net/vxlan.c:471:35: warning: symbol 'dev' shadows an earlier one
drivers/net/vxlan.c:433:26: originally declared here
drivers/net/vxlan.c:794:34: warning: symbol 'vxlan' shadows an earlier one
drivers/net/vxlan.c:757:26: originally declared here

CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pravin B Shelar 2013-03-26 08:29:30 +00:00 коммит произвёл David S. Miller
Родитель d4ec1b5cdd
Коммит 5abb0029c8
1 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

@ -468,15 +468,15 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
vni = vxlan->vni;
if (tb[NDA_IFINDEX]) {
struct net_device *dev;
struct net_device *tdev;
if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32))
return -EINVAL;
ifindex = nla_get_u32(tb[NDA_IFINDEX]);
dev = dev_get_by_index(net, ifindex);
if (!dev)
tdev = dev_get_by_index(net, ifindex);
if (!tdev)
return -EADDRNOTAVAIL;
dev_put(dev);
dev_put(tdev);
} else
ifindex = 0;
@ -792,7 +792,6 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb)
n = neigh_lookup(&arp_tbl, &tip, dev);
if (n) {
struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_fdb *f;
struct sk_buff *reply;