diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-04-02 11:07:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-02 14:05:00 -0400 |
commit | 1e99584b911cb6f3d2a681e2532d8dc3f9339c9c (patch) | |
tree | eec4ef0b2a2179418d5a4c7525eaec261d273bf5 /net/ipv4/ipip.c | |
parent | ecf2c06a88d2ed534a87b84b8c1a467ab23352dd (diff) |
ipip,gre,vti,sit: implement ndo_get_iflink
Don't use dev->iflink anymore.
CC: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index bfbcc85c02ee..5c81f6e40842 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -272,6 +272,7 @@ static const struct net_device_ops ipip_netdev_ops = { | |||
272 | .ndo_do_ioctl = ipip_tunnel_ioctl, | 272 | .ndo_do_ioctl = ipip_tunnel_ioctl, |
273 | .ndo_change_mtu = ip_tunnel_change_mtu, | 273 | .ndo_change_mtu = ip_tunnel_change_mtu, |
274 | .ndo_get_stats64 = ip_tunnel_get_stats64, | 274 | .ndo_get_stats64 = ip_tunnel_get_stats64, |
275 | .ndo_get_iflink = ip_tunnel_get_iflink, | ||
275 | }; | 276 | }; |
276 | 277 | ||
277 | #define IPIP_FEATURES (NETIF_F_SG | \ | 278 | #define IPIP_FEATURES (NETIF_F_SG | \ |
@@ -286,7 +287,6 @@ static void ipip_tunnel_setup(struct net_device *dev) | |||
286 | 287 | ||
287 | dev->type = ARPHRD_TUNNEL; | 288 | dev->type = ARPHRD_TUNNEL; |
288 | dev->flags = IFF_NOARP; | 289 | dev->flags = IFF_NOARP; |
289 | dev->iflink = 0; | ||
290 | dev->addr_len = 4; | 290 | dev->addr_len = 4; |
291 | dev->features |= NETIF_F_LLTX; | 291 | dev->features |= NETIF_F_LLTX; |
292 | netif_keep_dst(dev); | 292 | netif_keep_dst(dev); |