diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-04-29 17:12:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-02 19:23:32 -0400 |
| commit | 79ecb90e65f33d1941ac1f8e43eec34ec3bdbad8 (patch) | |
| tree | 39bb9d5b58a76782437b675b0abb92ff3e74a570 /net/ipv6 | |
| parent | 182a352d2d5e0b435f7856c0cc23d467dcec55ef (diff) | |
| download | op-kernel-dev-79ecb90e65f33d1941ac1f8e43eec34ec3bdbad8.zip op-kernel-dev-79ecb90e65f33d1941ac1f8e43eec34ec3bdbad8.tar.gz | |
ipv6: Generic tunnel cleanup
A few generic changes to generalize tunnels in IPv6:
- Export ip6_tnl_change_mtu so that it can be called by ip6_gre
- Add tun_hlen to ip6_tnl structure.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index b1f31d2..ade55af 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1540,8 +1540,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) * %-EINVAL if mtu too small **/ -static int -ip6_tnl_change_mtu(struct net_device *dev, int new_mtu) +int ip6_tnl_change_mtu(struct net_device *dev, int new_mtu) { struct ip6_tnl *tnl = netdev_priv(dev); @@ -1557,6 +1556,7 @@ ip6_tnl_change_mtu(struct net_device *dev, int new_mtu) dev->mtu = new_mtu; return 0; } +EXPORT_SYMBOL(ip6_tnl_change_mtu); int ip6_tnl_get_iflink(const struct net_device *dev) { @@ -1632,6 +1632,9 @@ ip6_tnl_dev_init_gen(struct net_device *dev) if (ret) goto destroy_dst; + t->hlen = 0; + t->tun_hlen = 0; + return 0; destroy_dst: |
