diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-11 00:46:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-11 00:46:00 -0700 |
| commit | 71930d61025e7d0254f3c682cb1b5242e0499cf3 (patch) | |
| tree | 43b642f15d33ae6ba08a31ddf2d50e2915868a5e /net/xfrm | |
| parent | a594920f8747fa032c784c3660d6cd5a8ab291f8 (diff) | |
| parent | 1df0d8960499e58963fd6c8ac75e544f2b417b29 (diff) | |
| download | linux-stable-71930d61025e7d0254f3c682cb1b5242e0499cf3.tar.gz linux-stable-71930d61025e7d0254f3c682cb1b5242e0499cf3.tar.bz2 linux-stable-71930d61025e7d0254f3c682cb1b5242e0499cf3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index c407ecbc5d46..b615729812e5 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -37,6 +37,7 @@ #include <net/ip.h> #include <net/ipv6.h> #include <net/ip6_route.h> +#include <net/ip_tunnels.h> #include <net/addrconf.h> #include <net/xfrm.h> #include <net/net_namespace.h> @@ -581,6 +582,7 @@ static const struct net_device_ops xfrmi_netdev_ops = { static void xfrmi_dev_setup(struct net_device *dev) { dev->netdev_ops = &xfrmi_netdev_ops; + dev->header_ops = &ip_tunnel_header_ops; dev->type = ARPHRD_NONE; dev->mtu = ETH_DATA_LEN; dev->min_mtu = ETH_MIN_MTU; |