redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ipvlan: remove counters of ipv4 and ipv6 addresses

Browse source 
They are unused after commit f631c44bbe ("ipvlan: Always set broadcast bit in
multicast filter").

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Konstantin Khlebnikov 2015-07-14 16:35:50 +03:00 committed by David S. Miller
parent 20b953edf9
commit 515866f818
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ipvlan/ipvlan.h
View file

@ -67,8 +67,6 @@ struct ipvl_dev {
struct ipvl_port *port; struct ipvl_port *port;
struct net_device *phy_dev; struct net_device *phy_dev;
struct list_head addrs; struct list_head addrs;
int ipv4cnt;
int ipv6cnt;
struct ipvl_pcpu_stats __percpu *pcpu_stats; struct ipvl_pcpu_stats __percpu *pcpu_stats;
DECLARE_BITMAP(mac_filters, IPVLAN_MAC_FILTER_SIZE); DECLARE_BITMAP(mac_filters, IPVLAN_MAC_FILTER_SIZE);
netdev_features_t sfeatures; netdev_features_t sfeatures;

33
drivers/net/ipvlan/ipvlan_main.c
View file

@ -153,10 +153,9 @@ static int ipvlan_open(struct net_device *dev)
else else
dev->flags &= ~IFF_NOARP; dev->flags &= ~IFF_NOARP;
if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) { list_for_each_entry(addr, &ipvlan->addrs, anode)
list_for_each_entry(addr, &ipvlan->addrs, anode) ipvlan_ht_addr_add(ipvlan, addr);
ipvlan_ht_addr_add(ipvlan, addr);
}
return dev_uc_add(phy_dev, phy_dev->dev_addr); return dev_uc_add(phy_dev, phy_dev->dev_addr);
} }
@ -171,10 +170,9 @@ static int ipvlan_stop(struct net_device *dev)
dev_uc_del(phy_dev, phy_dev->dev_addr); dev_uc_del(phy_dev, phy_dev->dev_addr);
if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) { list_for_each_entry(addr, &ipvlan->addrs, anode)
list_for_each_entry(addr, &ipvlan->addrs, anode) ipvlan_ht_addr_del(addr, !dev->dismantle);
ipvlan_ht_addr_del(addr, !dev->dismantle);
}
return 0; return 0;
} }
@ -471,8 +469,6 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
ipvlan->port = port; ipvlan->port = port;
ipvlan->sfeatures = IPVLAN_FEATURES; ipvlan->sfeatures = IPVLAN_FEATURES;
INIT_LIST_HEAD(&ipvlan->addrs); INIT_LIST_HEAD(&ipvlan->addrs);
ipvlan->ipv4cnt = 0;
ipvlan->ipv6cnt = 0;
/* TODO Probably put random address here to be presented to the /* TODO Probably put random address here to be presented to the
* world but keep using the physical-dev address for the outgoing * world but keep using the physical-dev address for the outgoing
@ -508,12 +504,11 @@ static void ipvlan_link_delete(struct net_device *dev, struct list_head *head)
struct ipvl_dev *ipvlan = netdev_priv(dev); struct ipvl_dev *ipvlan = netdev_priv(dev);
struct ipvl_addr *addr, *next; struct ipvl_addr *addr, *next;
if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) { list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) {
list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) { ipvlan_ht_addr_del(addr, !dev->dismantle);
ipvlan_ht_addr_del(addr, !dev->dismantle); list_del(&addr->anode);
list_del(&addr->anode);
}
} }
list_del_rcu(&ipvlan->pnode); list_del_rcu(&ipvlan->pnode);
unregister_netdevice_queue(dev, head); unregister_netdevice_queue(dev, head);
netdev_upper_dev_unlink(ipvlan->phy_dev, dev); netdev_upper_dev_unlink(ipvlan->phy_dev, dev);
@ -627,7 +622,7 @@ static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr)); memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr));
addr->atype = IPVL_IPV6; addr->atype = IPVL_IPV6;
list_add_tail(&addr->anode, &ipvlan->addrs); list_add_tail(&addr->anode, &ipvlan->addrs);
ipvlan->ipv6cnt++;
/* If the interface is not up, the address will be added to the hash /* If the interface is not up, the address will be added to the hash
* list by ipvlan_open. * list by ipvlan_open.
*/ */
@ -647,8 +642,6 @@ static void ipvlan_del_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
ipvlan_ht_addr_del(addr, true); ipvlan_ht_addr_del(addr, true);
list_del(&addr->anode); list_del(&addr->anode);
ipvlan->ipv6cnt--;
WARN_ON(ipvlan->ipv6cnt < 0);
kfree_rcu(addr, rcu); kfree_rcu(addr, rcu);
return; return;
@ -699,7 +692,7 @@ static int ipvlan_add_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr)); memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr));
addr->atype = IPVL_IPV4; addr->atype = IPVL_IPV4;
list_add_tail(&addr->anode, &ipvlan->addrs); list_add_tail(&addr->anode, &ipvlan->addrs);
ipvlan->ipv4cnt++;
/* If the interface is not up, the address will be added to the hash /* If the interface is not up, the address will be added to the hash
* list by ipvlan_open. * list by ipvlan_open.
*/ */
@ -719,8 +712,6 @@ static void ipvlan_del_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
ipvlan_ht_addr_del(addr, true); ipvlan_ht_addr_del(addr, true);
list_del(&addr->anode); list_del(&addr->anode);
ipvlan->ipv4cnt--;
WARN_ON(ipvlan->ipv4cnt < 0);
kfree_rcu(addr, rcu); kfree_rcu(addr, rcu);
return; return;