diff options
| -rw-r--r-- | kernel/linux/net/bridge/br_input.c | 2 | ||||
| -rwxr-xr-x | kernel/scripts/Makediff2.5 | 67 |
2 files changed, 68 insertions, 1 deletions
diff --git a/kernel/linux/net/bridge/br_input.c b/kernel/linux/net/bridge/br_input.c index 1ac96f5..352a63b 100644 --- a/kernel/linux/net/bridge/br_input.c +++ b/kernel/linux/net/bridge/br_input.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br_input.c,v 1.2 2002/08/22 17:49:34 bdschuym Exp $ + * $Id: br_input.c,v 1.3 2002/08/23 16:56:52 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/kernel/scripts/Makediff2.5 b/kernel/scripts/Makediff2.5 new file mode 100755 index 0000000..5065c27 --- /dev/null +++ b/kernel/scripts/Makediff2.5 @@ -0,0 +1,67 @@ +#!/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 +# 23 August 2002: made this file for patches vs 2.5, added Config.help + +export FROM=linux +export TO=ebt2.0-rc2-dev +export FILE=ebtables-v2.0-rc2-dev_vs_2.5.31.diff + +echo "ebtables-v2.0-rc2-dev - 23 August 2002" >$FILE +echo >>$FILE +echo "*** modifications for brouter support ***" >>$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.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/Config.help >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebtable_filter.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebtable_nat.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebtable_broute.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_mark.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_mark_m.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_redirect.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_arp.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_ip.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_vlan.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_log.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_snat.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebt_dnat.c >> $FILE +diff -urN /dev/null $TO/net/bridge/netfilter/ebtables.c >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebtables.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_arp.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_ip.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_vlan.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_log.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_nat.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_redirect.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_mark_m.h >> $FILE +diff -urN /dev/null $TO/include/linux/netfilter_bridge/ebt_mark_t.h >> $FILE |