diff options
author | David S. Miller <davem@davemloft.net> | 2022-07-25 13:25:39 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2022-07-25 13:25:39 +0100 |
commit | e222dc8d8408788e906a5c0dd5f01fbe7f6cd1d3 (patch) | |
tree | c3ed571bf7c664f44b08c740b60fbb5cb7057fd0 /drivers | |
parent | 7e7125ddd8f90ae8104e2f3be6dece32b28e9c45 (diff) | |
parent | 5e25c25aa2c08fb9a79476e029c0b1e3dcd70566 (diff) | |
download | linux-e222dc8d8408788e906a5c0dd5f01fbe7f6cd1d3.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2022-07-20
1) Don't set DST_NOPOLICY in IPv4, a recent patch made this
superfluous. From Eyal Birger.
2) Convert alg_key to flexible array member to avoid an iproute2
compile warning when built with gcc-12.
From Stephen Hemminger.
3) xfrm_register_km and xfrm_unregister_km do always return 0
so change the type to void. From Zhengchao Shao.
4) Fix spelling mistake in esp6.c
From Zhang Jiaming.
5) Improve the wording of comment above XFRM_OFFLOAD flags.
From Petr Vaněk.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/vrf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 40445a12c682..5df7a0abc39d 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -1077,7 +1077,7 @@ static int vrf_rtable_create(struct net_device *dev) return -ENOMEM; /* create a dst for routing packets out through a VRF device */ - rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1, 1); + rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1); if (!rth) return -ENOMEM; |