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

Joshua Kwan joshk@haydn.debian.org
Fri, 13 Aug 2004 17:09:21 -0600


Author: joshk
Date: 2004-08-13 17:09:09 -0600 (Fri, 13 Aug 2004)
New Revision: 1070

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff
Log:
remove the hunk that removes xfrm_check_output, which isn't fully resolved in this diff and seems superfluous for now


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 19:13:37 UTC (rev 1069)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff	2004-08-13 23:09:09 UTC (rev 1070)
@@ -140,142 +140,6 @@
  		} else {
  			x->km.state = XFRM_STATE_DEAD;
  			xfrm_state_put(x);
-#ChangeSet1.1722.172.4
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/06/18 15:21:08+09:00 yoshfuji@linux-ipv6.org 
-#   [XFRM] fix dependency issues for CONFIG_IPV6=m.
-# 
-# include/net/xfrm.h
-#   2004/06/18 15:20:58+09:00 yoshfuji@linux-ipv6.org +1 -1
-#   [XFRM] split up xfrm_check_output() into two functions to solve dependency issues.
-# 
-# net/xfrm/Makefile
-#   2004/06/18 15:20:58+09:00 yoshfuji@linux-ipv6.org +1 -1
-#   [XFRM] split up xfrm_check_output() into two functions to solve dependency issues.
-# 
-# net/xfrm/xfrm_export.c
-#   2004/06/18 15:20:58+09:00 yoshfuji@linux-ipv6.org +1 -1
-#   [XFRM] split up xfrm_check_output() into two functions to solve dependency issues.
-# 
-# net/xfrm/xfrm_state.c
-#   2004/06/18 15:20:58+09:00 yoshfuji@linux-ipv6.org +10 -0
-#   [XFRM] split up xfrm_check_output() into two functions to solve dependency issues.
-# 
-diff -Nru a/include/net/xfrm.h b/include/net/xfrm.h
---- a/include/net/xfrm.h	2004-07-28 21:35:50 -07:00
-+++ b/include/net/xfrm.h	2004-07-28 21:35:50 -07:00
-@@ -816,7 +816,7 @@
- extern int xfrm_replay_check(struct xfrm_state *x, u32 seq);
- extern void xfrm_replay_advance(struct xfrm_state *x, u32 seq);
- extern int xfrm_check_selectors(struct xfrm_state **x, int n, struct flowi *fl);
--extern int xfrm_check_output(struct xfrm_state *x, struct sk_buff *skb, unsigned short family);
-+extern int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb);
- extern int xfrm4_rcv(struct sk_buff *skb);
- extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler);
- extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler);
-diff -Nru a/net/xfrm/Makefile b/net/xfrm/Makefile
---- a/net/xfrm/Makefile	2004-07-28 21:35:50 -07:00
-+++ b/net/xfrm/Makefile	2004-07-28 21:35:50 -07:00
-@@ -2,7 +2,7 @@
- # Makefile for the XFRM subsystem.
- #
- 
--obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_input.o xfrm_algo.o xfrm_output.o \
-+obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_input.o xfrm_algo.o \
- 	xfrm_export.o
- obj-$(CONFIG_XFRM_USER) += xfrm_user.o
- 
-diff -Nru a/net/xfrm/xfrm_export.c b/net/xfrm/xfrm_export.c
---- a/net/xfrm/xfrm_export.c	2004-07-28 21:35:50 -07:00
-+++ b/net/xfrm/xfrm_export.c	2004-07-28 21:35:50 -07:00
-@@ -18,6 +18,7 @@
- EXPORT_SYMBOL(xfrm_state_update);
- EXPORT_SYMBOL(xfrm_state_check_expire);
- EXPORT_SYMBOL(xfrm_state_check_space);
-+EXPORT_SYMBOL(xfrm_state_check);
- EXPORT_SYMBOL(xfrm_state_lookup);
- EXPORT_SYMBOL(xfrm_state_register_afinfo);
- EXPORT_SYMBOL(xfrm_state_unregister_afinfo);
-@@ -27,7 +28,6 @@
- EXPORT_SYMBOL(xfrm_replay_check);
- EXPORT_SYMBOL(xfrm_replay_advance);
- EXPORT_SYMBOL(xfrm_check_selectors);
--EXPORT_SYMBOL(xfrm_check_output);
- EXPORT_SYMBOL(__secpath_destroy);
- EXPORT_SYMBOL(secpath_dup);
- EXPORT_SYMBOL(xfrm_get_acqseq);
-diff -Nru a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
---- a/net/xfrm/xfrm_output.c	2004-07-28 21:35:50 -07:00
-+++ /dev/null	Wed Dec 31 16:00:00 196900
-@@ -1,46 +0,0 @@
--/* 
-- * generic xfrm output routines
-- *
-- * Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
-- *
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the Free
-- * Software Foundation; either version 2 of the License, or (at your option) 
-- * any later version.
-- */
--#include <linux/config.h>
--#include <linux/kernel.h>
--#include <linux/skbuff.h>
--#include <net/xfrm.h>
--
--int xfrm_check_output(struct xfrm_state *x,
--                      struct sk_buff *skb, unsigned short family)
--{
--	int err;
--	
--	err = xfrm_state_check_expire(x);
--	if (err)
--		goto out;
--		
--	if (x->props.mode) {
--		switch (family) {
--		case AF_INET:
--			err = xfrm4_tunnel_check_size(skb);
--			break;
--			
--		case AF_INET6:
--			err = xfrm6_tunnel_check_size(skb);
--			break;
--			
--		default:
--			err = -EINVAL;
--		}
--		
--		if (err)
--			goto out;
--	}
--
--	err = xfrm_state_check_space(x, skb);
--out:
--	return err;
--}
-diff -Nru a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
---- a/net/xfrm/xfrm_state.c	2004-07-28 21:35:50 -07:00
-+++ b/net/xfrm/xfrm_state.c	2004-07-28 21:35:50 -07:00
-@@ -531,6 +531,16 @@
- 	return 0;
- }
- 
-+int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)
-+{
-+	int err = xfrm_state_check_expire(x);
-+	if (err < 0)
-+		goto err;
-+	err = xfrm_state_check_space(x, skb);
-+err:
-+	return err;
-+}
-+
- struct xfrm_state *
- xfrm_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto,
- 		  unsigned short family)
 #ChangeSet1.1722.2.41
 # This is a BitKeeper generated diff -Nru style patch.
 #