diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-13 11:28:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-13 11:28:54 -0800 |
| commit | 895badff2c2b68c67e77a4537754a46026d4c2d7 (patch) | |
| tree | 4b6add060d8cb9eef3ee936a2ea6234c71be518c /include | |
| parent | Merge branch 'ARM-Enable-GENET-support-for-RPi-4' (diff) | |
| parent | xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE) (diff) | |
| download | linux-dev-895badff2c2b68c67e77a4537754a46026d4c2d7.tar.xz linux-dev-895badff2c2b68c67e77a4537754a46026d4c2d7.zip | |
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 2019-11-13
1) Remove a unnecessary net_exit function from the xfrm interface.
From Xin Long.
2) Assign xfrm4_udp_encap_rcv to a UDP socket only if xfrm
is configured. From Alexey Dobriyan.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index aa08a7a5f6ac..dda3c025452e 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1613,13 +1613,6 @@ static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optv { return -ENOPROTOOPT; } - -static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) -{ - /* should not happen */ - kfree_skb(skb); - return 0; -} #endif struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif, |