diff mbox series

xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE)

Message ID 20191003212157.GA6943@avx2
State Awaiting Upstream
Delegated to: David Miller
Headers show
Series xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE) | expand

Commit Message

Alexey Dobriyan Oct. 3, 2019, 9:21 p.m. UTC 
If IPsec is not configured, there is no reason to delay the inevitable.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 include/net/xfrm.h |    7 -------
 net/ipv4/udp.c     |    2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Steffen Klassert Oct. 10, 2019, 10:23 a.m. UTC | #1 
On Fri, Oct 04, 2019 at 12:21:57AM +0300, Alexey Dobriyan wrote:
> If IPsec is not configured, there is no reason to delay the inevitable.
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Applied to ipsec-next, thanks!
diff mbox series

Patch

--- 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,
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2520,9 +2520,11 @@  int udp_lib_setsockopt(struct sock *sk, int level, int optname,
 	case UDP_ENCAP:
 		switch (val) {
 		case 0:
+#ifdef CONFIG_XFRM
 		case UDP_ENCAP_ESPINUDP:
 		case UDP_ENCAP_ESPINUDP_NON_IKE:
 			up->encap_rcv = xfrm4_udp_encap_rcv;
+#endif
 			/* FALLTHROUGH */
 		case UDP_ENCAP_L2TPINUDP:
 			up->encap_type = val;