Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next (895badff) · Commits · 戴 / test

include/net/xfrm.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -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,

+2 −0

Original line number	Diff line number	Diff line
		@@ -2534,9 +2534,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;

+0 −23

Original line number	Diff line number	Diff line
		@@ -732,30 +732,7 @@ static struct rtnl_link_ops xfrmi_link_ops __read_mostly = {
		.get_link_net = xfrmi_get_link_net,
		};

		static void __net_exit xfrmi_destroy_interfaces(struct xfrmi_net *xfrmn)
		{
		struct xfrm_if *xi;
		LIST_HEAD(list);

		xi = rtnl_dereference(xfrmn->xfrmi[0]);
		if (!xi)
		return;

		unregister_netdevice_queue(xi->dev, &list);
		unregister_netdevice_many(&list);
		}

		static void __net_exit xfrmi_exit_net(struct net *net)
		{
		struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id);

		rtnl_lock();
		xfrmi_destroy_interfaces(xfrmn);
		rtnl_unlock();
		}

		static struct pernet_operations xfrmi_net_ops = {
		.exit = xfrmi_exit_net,
		.id = &xfrmi_net_id,
		.size = sizeof(struct xfrmi_net),
		};