dev: introduce dev_get_iflink()

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 <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index 2a17500..131bde9 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -330,7 +330,7 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb)
        struct rtable *rt;
        int err, ret = NET_XMIT_DROP;
        struct flowi4 fl4 = {
-               .flowi4_oif = dev->iflink,
+               .flowi4_oif = dev_get_iflink(dev),
                .flowi4_tos = RT_TOS(ip4h->tos),
                .flowi4_flags = FLOWI_FLAG_ANYSRC,
                .daddr = ip4h->daddr,

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/batman-adv/hard-interface.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/link_watch.c
Simple merge

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ip6mr.c
Simple merge