r1060 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-13 02:19:27 -0600 (Fri, 13 Aug 2004)
New Revision: 1060

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff
Log:
drop a changeset that depends on some new features from 2.6 we don't really want


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff	2004-08-13 07:36:26 UTC (rev 1059)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff	2004-08-13 08:19:27 UTC (rev 1060)
@@ -510,86 +510,7 @@
  	spin_lock_bh(&x->lock);
  	__xfrm_state_delete(x);
  	spin_unlock_bh(&x->lock);
-#ChangeSet1.1757.15.27
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/06/25 10:34:15-07:00 herbert@gondor.apana.org.au 
-#   [IPSEC]: Check encap_type at config time, in user API code.
-#   
-#   Here is the patch to check encap_type at the earliest possible
-#   opportunity in xfrm_user/af_key.
-#   
-#   This will allow us to assume in esp4 that the encap_type from x->encap
-#   is always valid.
-#   
-#   Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-#   Signed-off-by: David S. Miller <davem@redhat.com>
-# 
-# net/key/af_key.c
-#   2004/06/25 10:34:00-07:00 herbert@gondor.apana.org.au +9 -0
-#   [IPSEC]: Check encap_type at config time, in user API code.
-#   
-#   Here is the patch to check encap_type at the earliest possible
-#   opportunity in xfrm_user/af_key.
-#   
-#   This will allow us to assume in esp4 that the encap_type from x->encap
-#   is always valid.
-#   
-#   Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-#   Signed-off-by: David S. Miller <davem@redhat.com>
-# 
-# net/xfrm/xfrm_user.c
-#   2004/06/25 10:34:00-07:00 herbert@gondor.apana.org.au +9 -0
-#   [IPSEC]: Check encap_type at config time, in user API code.
-#   
-#   Here is the patch to check encap_type at the earliest possible
-#   opportunity in xfrm_user/af_key.
-#   
-#   This will allow us to assume in esp4 that the encap_type from x->encap
-#   is always valid.
-#   
-#   Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-#   Signed-off-by: David S. Miller <davem@redhat.com>
-# 
-diff -Nru a/net/key/af_key.c b/net/key/af_key.c
---- a/net/key/af_key.c	2004-07-28 23:11:52 -07:00
-+++ b/net/key/af_key.c	2004-07-28 23:11:52 -07:00
-@@ -1075,6 +1075,15 @@
- 		n_type = ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1];
- 		natt->encap_type = n_type->sadb_x_nat_t_type_type;
  
-+		switch (natt->encap_type) {
-+		case UDP_ENCAP_ESPINUDP:
-+		case UDP_ENCAP_ESPINUDP_NON_IKE:
-+			break;
-+		default:
-+			err = -ENOPROTOOPT;
-+			goto out;
-+		}
-+
- 		if (ext_hdrs[SADB_X_EXT_NAT_T_SPORT-1]) {
- 			struct sadb_x_nat_t_port* n_port =
- 				ext_hdrs[SADB_X_EXT_NAT_T_SPORT-1];
-diff -Nru a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
---- a/net/xfrm/xfrm_user.c	2004-07-28 23:11:52 -07:00
-+++ b/net/xfrm/xfrm_user.c	2004-07-28 23:11:52 -07:00
-@@ -78,6 +78,15 @@
- 	if ((rt->rta_len - sizeof(*rt)) < sizeof(*encap))
- 		return -EINVAL;
- 
-+	encap = RTA_DATA(rt);
-+	switch (encap->encap_type) {
-+	case UDP_ENCAP_ESPINUDP:
-+	case UDP_ENCAP_ESPINUDP_NON_IKE:
-+		break;
-+	default:
-+		return -ENOPROTOOPT;
-+	}
-+
- 	return 0;
- }
- 
 #ChangeSet1.1784.11.13
 # This is a BitKeeper generated diff -Nru style patch.
 #