linux/drivers/net/ipvlan, branch v4.1

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-04-02T20:16:53Z

Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller

ipvlan: implement ndo_get_iflink

2015-04-02T18:05:00Z

Don't use dev->iflink anymore. CC: Mahesh Bandewar Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller

dev: introduce dev_get_iflink()

2015-04-02T18:04:59Z

The goal of this patch is to prepare the removal of the iflink field. It introduces a new ndo function, which will be implemented by virtual interfaces. There is no functional change into this patch. All readers of iflink field now call dev_get_iflink(). Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller

ipvlan: fix check for IP addresses in control path

2015-03-31T17:28:33Z

When an ipvlan interface is down, its addresses are not on the hash list. Fix checks for existence of addresses not to depend on the hash list, walk through all interface addresses instead. Signed-off-by: Jiri Benc Acked-by: Mahesh Bandewar Signed-off-by: David S. Miller

ipvlan: do not use rcu operations for address list

2015-03-31T17:28:33Z

All accesses to ipvlan->addrs are under rtnl. Signed-off-by: Jiri Benc Signed-off-by: David S. Miller

ipvlan: protect against concurrent link removal

2015-03-31T17:28:33Z

Adding and removing to the 'ipvlans' list is already done using _rcu list operations. Signed-off-by: Jiri Benc Signed-off-by: David S. Miller

ipvlan: fix addr hash list corruption

2015-03-31T17:28:33Z

When ipvlan interface with IP addresses attached is brought down and then deleted, the assigned addresses are deleted twice from the address hash list, first on the interface down and second on the link deletion. Similarly, when an address is added while the interface is down, it is added second time once the interface is brought up. When the interface is down, the addresses should be kept off the hash list for performance reasons. Ensure this is true, which also fixes the double add problem. To fix the double free, check whether the address is hashed before removing it. Reported-by: Dan Williams Signed-off-by: Jiri Benc Signed-off-by: Mahesh Bandewar Signed-off-by: David S. Miller

net: Kill dev_rebuild_header

2015-03-02T21:43:41Z

Now that there are no more users kill dev_rebuild_header and all of it's implementations. This is long overdue. Signed-off-by: "Eric W. Biederman" Signed-off-by: David S. Miller

ipvlan: add a missing __percpu pcpu_stats

2015-02-12T04:03:23Z

Cosmetic patch to add __percpu qualifier to pcpu_stats Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller

net: mark some potential candidates __read_mostly

2015-01-31T01:58:39Z

They are all either written once or extremly rarely (e.g. from init code), so we can move them to the .data..read_mostly section. Signed-off-by: Daniel Borkmann Signed-off-by: David S. Miller