From b20d99827149dd5c56511de75afff01a09f015b8 Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Fri, 27 Sep 2002 17:10:09 +0000
Subject: *** empty log message ***

---
 kernel/scripts/Makediff | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/kernel/scripts/Makediff b/kernel/scripts/Makediff
index f452575..46eefaa 100755
--- a/kernel/scripts/Makediff
+++ b/kernel/scripts/Makediff
@@ -1,50 +1,32 @@
 #!/bin/bash
 # Makes a base diff for the ebtables kernel code
-# This diff should be vs a kernel patched with the
-# br-nf patch.
 
 # 6 June 2002: added ebt_snat.c, ebt_dnat.c files, removed ebt_nat.c file
 # 31 July 2002: added mark match/target, bridge/br.c, bridge/Makefile;
 #               deleted netsyms
 # 20 August 2002: deleted br_db
-# 10 September 2002: added br_forward.c
+# 18 September 2002: added br_forward.c
 
-export FROM=linux
-export TO=ebt2.0-rc2
-export FILE=ebtables-v2.0-rc2_vs_2.4.20-pre4.diff
+export FROM=linux-2.4.20-pre5
+export TO=linux-2.4.20-pre5-ebtables
+export FILE=ebtables-v2.0_vs_2.4.20-pre5.diff
 
-echo "ebtables-v2.0-rc2-dev - 21 August 2002" >$FILE
-echo >>$FILE
-echo "*** deal with NETFILTER_DEBUG ***" >>$FILE
-echo >>$FILE
-
-diff -urNp --exclude TAGS $FROM/net/bridge/br_forward.c $TO/net/bridge/br_forward.c >> $FILE
-
-echo "*** modifications for brouter support ***" >>$FILE
+echo "ebtables-v2.0 vs 2.4.20-pre5 - 17 September 2002" >$FILE
 echo >>$FILE
 
 diff -urNp --exclude TAGS $FROM/net/bridge/br_private.h $TO/net/bridge/br_private.h >> $FILE
 diff -urNp --exclude TAGS $FROM/include/linux/if_bridge.h $TO/include/linux/if_bridge.h >> $FILE
 diff -urNp --exclude TAGS $FROM/net/core/dev.c $TO/net/core/dev.c >> $FILE
 diff -urNp --exclude TAGS $FROM/net/bridge/br_input.c $TO/net/bridge/br_input.c >> $FILE
+diff -urNp --exclude TAGS $FROM/net/bridge/br_forward.c $TO/net/bridge/br_forward.c >> $FILE
 diff -urNp --exclude TAGS $FROM/net/bridge/br.c $TO/net/bridge/br.c >> $FILE
 diff -urNp --exclude TAGS $FROM/net/bridge/Makefile $TO/net/bridge/Makefile >> $FILE
 diff -urNp --exclude TAGS $FROM/include/linux/netfilter_bridge.h $TO/include/linux/netfilter_bridge.h >> $FILE
 
-echo >>$FILE
-echo "*** modifications for ebtables compilation ***" >> $FILE
-echo >>$FILE
-
 # only needed for 2.4.x
 diff -urNp --exclude TAGS $FROM/net/Makefile $TO/net/Makefile >> $FILE
 diff -urNp --exclude TAGS $FROM/net/Config.in $TO/net/Config.in >> $FILE
 
-exit
-
-echo >>$FILE
-echo "*** new ebtables files ***" >> $FILE
-echo >>$FILE
-
 diff -urN /dev/null $TO/net/bridge/netfilter/Makefile >> $FILE
 diff -urN /dev/null $TO/net/bridge/netfilter/Config.in >> $FILE
 diff -urN /dev/null $TO/net/bridge/netfilter/ebtable_filter.c >> $FILE
-- 
cgit v1.2.3