problems with bridge patch

Hi everyone, I have problems with the bridge patch.
I have downloaded the lastest kernel v.2.4.27 from the kernel.org
and the lastest patch ebtables-brnf-5_vs_2.4.25.diff.gz
I do not use ebtables, I use bridge with iptables.
Last time I used bridge-nf-0.0.7-against-2.4.19.diff patch against
v.2.4.21 kernel and it worked propertly.
I thought that it is better to use  ebtables-brnf-5_vs_2.4.25.diff.gz
I unpacked and copied this file to KERNEL_DIR=/usr/src/linux and typed
there
patch -p1 -E<ebtables-brnf-5_vs_2.4.25.diff >patch_apl.txt 2>patch_err.txt
then I saw the following in patch_apl.txt
I tried to compile a kernel, but there are errors.
Please help.

Pasha.

---------------------- patch_apl.txt ----------------------
patching file net/bridge/br_private.h
Hunk #1 succeeded at 143 (offset -1 lines).
Hunk #2 succeeded at 168 with fuzz 1.
Hunk #3 succeeded at 178 (offset -2 lines).
patching file include/linux/if_bridge.h
patching file net/core/dev.c
patching file net/bridge/br_input.c
patching file net/bridge/br_forward.c
patching file net/bridge/br.c
Hunk #1 succeeded at 30 (offset 1 line).
Hunk #3 succeeded at 63 with fuzz 2 (offset -4 lines).
Hunk #4 succeeded at 86 (offset 3 lines).
patching file net/bridge/Makefile
patching file include/linux/netfilter_bridge.h
patching file net/Makefile
Hunk #1 FAILED at 7.
1 out of 2 hunks FAILED -- saving rejects to file net/Makefile.rej
patching file net/Config.in
patching file net/bridge/netfilter/Makefile
...
skiped many filenames
...
patching file include/linux/netfilter_ipv4.h
patching file include/linux/skbuff.h
Hunk #3 FAILED at 1186.
1 out of 3 hunks FAILED -- saving rejects to file include/linux/skbuff.h.rej
patching file net/core/netfilter.c
patching file net/core/skbuff.c
patching file net/ipv4/netfilter/ip_tables.c
Hunk #1 succeeded at 118 (offset -3 lines).
Hunk #3 succeeded at 181 (offset -3 lines).
Hunk #5 succeeded at 300 (offset -3 lines).
patching file net/ipv4/ip_output.c
patching file net/ipv4/netfilter/ipt_LOG.c
patching file net/ipv4/netfilter/Makefile
patching file net/ipv4/netfilter/Config.in
patching file net/bridge/br_netfilter.c
patching file net/ipv4/netfilter/ipt_physdev.c
patching file include/linux/netfilter_ipv4/ipt_physdev.h
patching file net/8021q/vlan_dev.c
Hunk #1 FAILED at 507.
1 out of 1 hunk FAILED -- saving rejects to file net/8021q/vlan_dev.c.rej
patching file include/linux/sysctl.h
Hunk #1 succeeded at 607 (offset 18 lines).
----------------------

Makefile.rej
----------------------
***************
*** 7,13 ****

  O_TARGET :=   network.o

- mod-subdirs :=        ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched core sctp
  export-objs :=        netsyms.o

  subdir-y :=   core ethernet
--- 7,14 ----

  O_TARGET :=   network.o

+ mod-subdirs :=        ipv4/netfilter ipv6/netfilter bridge/netfilter ipx irda \
+       bluetooth atm netlink sched core sctp
  export-objs :=        netsyms.o

  subdir-y :=   core ethernet
----------------------

Config.in.rej
----------------------
***************
*** 68,73 ****
     source net/decnet/Config.in
  fi
  dep_tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE $CONFIG_INET
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
     tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
     tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
--- 68,76 ----
     source net/decnet/Config.in
  fi
  dep_tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE $CONFIG_INET
+ if [ "$CONFIG_BRIDGE" != "n" -a "$CONFIG_NETFILTER" != "n" ]; then
+    source net/bridge/netfilter/Config.in
+ fi
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
     tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
     tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
----------------------

skbuff.h.rej
----------------------
***************
*** 92,97 ****
  struct nf_ct_info {
        struct nf_conntrack *master;
  };
  #endif

  struct sk_buff_head {
--- 92,111 ----
  struct nf_ct_info {
        struct nf_conntrack *master;
  };
+
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ struct nf_bridge_info {
+       atomic_t use;
+       struct net_device *physindev;
+       struct net_device *physoutdev;
+ #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+       struct net_device *netoutdev;
+ #endif
+       unsigned int mask;
+       unsigned long data[32 / sizeof(unsigned long)];
+ };
+ #endif
+
  #endif
 #endif        /* __KERNEL__ */
--- 1186,1205 ----
        if (nfct)
                atomic_inc(&nfct->master->use);
  }
+
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge)
+ {
+       if (nf_bridge && atomic_dec_and_test(&nf_bridge->use))
+               kfree(nf_bridge);
+ }
+ static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge)
+ {
+       if (nf_bridge)
+               atomic_inc(&nf_bridge->use);
+ }
+ #endif
+
  #endif

  #endif        /* __KERNEL__ */
----------------------




-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php