diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-22 10:26:05 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-22 10:26:05 +0300 |
commit | ab876728a91d89e93e4928895529cd5bb4dff6e4 (patch) | |
tree | 3aa7603c289f79a570cf15e4019b1acb9459e608 /include/net/ip_tunnels.h | |
parent | 35575e0e8ba633fc8276509a21f89b599b4f9006 (diff) | |
parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff) | |
download | linux-ab876728a91d89e93e4928895529cd5bb4dff6e4.tar.xz |
Merge tag 'v4.5-rc5' into efi/core, before queueing up new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ip_tunnels.h')
-rw-r--r-- | include/net/ip_tunnels.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 6db96ea0144f..dda9abf6b89c 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -230,6 +230,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd); int ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t, u8 *protocol, struct flowi4 *fl4); +int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict); int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu); struct rtnl_link_stats64 *ip_tunnel_get_stats64(struct net_device *dev, |