From: David S. Miller Date: Wed, 30 Sep 2015 03:41:10 +0000 (-0700) Subject: Merge branch 'L3_master_device' X-Git-Tag: MMI-PSA29.97-13-9~9125^2~248 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f82ff596c7a8917b21100117646c719017ce8fe4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'L3_master_device' David Ahern says: ==================== net: L3 master device The VRF device is essentially a Layer 3 master device used to associate netdevices with a specific routing table and to influence FIB lookups via 'ip rules' and controlling the oif/iif used for the lookup. This series generalizes the VRF into L3 master device, l3mdev. Similar to switchdev it has a Kconfig option and separate set of operations in net_device allowing it to be completely compiled out if not wanted. The l3mdev methods rely on the 'master' aspect and use of netdev_master_upper_dev_get_rcu to retrieve the master device from a given netdevice if it is enslaved to an L3_MASTER. The VRF device is converted to use the l3mdev operations. At the end the vrf_ptr is no longer and removed, as are all direct references to VRF. The end result is a much simpler implementation for VRF. Thanks to Nikolay for suggestions (eg., use of the master linkage which is the key to making this work) and to Roopa, Andy and Shrijeet for early reviews. v3 - added license header to l3mdev.c - export symbols in l3mdev.c for use with GPL modules - removed netdevice header from l3mdev.h (not needed) and fixed typo in comment v2 - rebased to top of net-next - addressed Niks comments (checking master, removing extra lines, and flipping the order of patches 1 and 2) ==================== Signed-off-by: David S. Miller --- f82ff596c7a8917b21100117646c719017ce8fe4