diff options
| author | David S. Miller <davem@davemloft.net> | 2021-11-01 13:01:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-01 13:01:44 +0000 |
| commit | 06f1ecd433708f166f174920b9a785e831bb4f25 (patch) | |
| tree | ae9b8473c66a9b2932b5d59be46b15d8664c437f /net/ipv4 | |
| parent | 894d08443470cb3878153cb9ca6b14231579fd52 (diff) | |
| parent | ad57dae8a64da3926a22debbbe7d3b487a685a08 (diff) | |
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 2021-10-30
Just two minor changes this time:
1) Remove some superfluous header files from xfrm4_tunnel.c
From Mianhan Liu.
2) Simplify some error checks in xfrm_input().
From luo penghao.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index f4555a88f86b..9d4f418f1bf8 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c @@ -8,9 +8,7 @@ #include <linux/skbuff.h> #include <linux/module.h> -#include <linux/mutex.h> #include <net/xfrm.h> -#include <net/ip.h> #include <net/protocol.h> static int ipip_output(struct xfrm_state *x, struct sk_buff *skb) |