On 27/02/18 20:58, Yuval Mintz wrote:

The two implementations have almost identical structures - vif_device and
mif_device. As a step toward uniforming the mr_tables, eliminate the
mif_device and relocate the vif_device definition into a new common
header file.

Also, introduce a common initializing function for setting most of the
vif_device fields in a new common source file. This requires modifying
the ipv{4,6] Kconfig and ipv4 makefile as we're introducing a new common
config option - CONFIG_IP_MROUTE_COMMON.

Signed-off-by: Yuval Mintz <redacted>
---
 include/linux/mroute.h      | 13 +-----------
 include/linux/mroute6.h     | 11 +---------
 include/linux/mroute_base.h | 52 +++++++++++++++++++++++++++++++++++++++++++++
 net/ipv4/Kconfig            |  5 +++++
 net/ipv4/Makefile           |  1 +
 net/ipv4/ipmr.c             | 32 +++++++++++++---------------
 net/ipv4/ipmr_base.c        | 28 ++++++++++++++++++++++++
 net/ipv6/Kconfig            |  1 +
 net/ipv6/ip6mr.c            | 37 ++++++++++++--------------------
 9 files changed, 117 insertions(+), 63 deletions(-)
 create mode 100644 include/linux/mroute_base.h
 create mode 100644 net/ipv4/ipmr_base.c

Acked-by: Nikolay Aleksandrov <redacted>