I got a fresh copy of linux-2.4.20 from kernel.org and attempted to apply
the
bridge-nf-0.0.10-against-2.4.20.diff patch. There were two errors (see
below).
Did I do something wrong? Is there anything else I can provide to help
debug?
I was able to successfully apply the bridge-nf-0.0.8-against-2.4.19.diff
patch.
Regards,
Brad Morgan
Script started on Thu Feb 6 15:40:03 2003
[root@SKIP-MORGAN src]# tar xzf /root/linux-2.4.20.tar.gz
[root@SKIP-MORGAN src]# cd linux-2.4.20
[root@SKIP-MORGAN linux-2.4.20]# patch -p1 <
/root/bridge-nf-0.0.10-against-2.4.20.diff
patching file include/linux/netfilter.h
patching file include/linux/netfilter_ipv4.h
patching file include/linux/netfilter_bridge.h
Hunk #2 FAILED at 25.
1 out of 2 hunks FAILED -- saving rejects to file
include/linux/netfilter_bridge.h.rej
patching file include/linux/skbuff.h
patching file net/bridge/br.c
Hunk #1 succeeded at 43 (offset -2 lines).
patching file net/bridge/br_forward.c
Hunk #2 succeeded at 54 with fuzz 2 (offset -3 lines).
patching file net/bridge/br_input.c
Hunk #1 succeeded at 46 (offset -3 lines).
patching file net/bridge/br_private.h
Hunk #2 FAILED at 168.
1 out of 3 hunks FAILED -- saving rejects to file
net/bridge/br_private.h.rej
patching file net/bridge/Makefile
Hunk #1 succeeded at 11 (offset -2 lines).
patching file net/core/netfilter.c
patching file net/core/skbuff.c
patching file net/ipv4/netfilter/ip_tables.c
patching file net/ipv4/ip_output.c
patching file net/ipv4/netfilter/ipt_LOG.c
patching file net/bridge/br_netfilter.c
[root@SKIP-MORGAN linux-2.4.20]# cat include/linux/netfilter_bridge.h.rej
***************
*** 22,35 ****
#define NF_BR_BROUTING 5
#define NF_BR_NUMHOOKS 6
enum nf_br_hook_priorities {
NF_BR_PRI_FIRST = INT_MIN,
- NF_BR_PRI_FILTER_BRIDGED = -200,
- NF_BR_PRI_FILTER_OTHER = 200,
NF_BR_PRI_NAT_DST_BRIDGED = -300,
NF_BR_PRI_NAT_DST_OTHER = 100,
NF_BR_PRI_NAT_SRC = 300,
NF_BR_PRI_LAST = INT_MAX,
};
#endif
--- 25,68 ----
#define NF_BR_BROUTING 5
#define NF_BR_NUMHOOKS 6
+ #ifdef __KERNEL__
+
+ #define BRNF_PKT_TYPE 0x01
+ #define BRNF_BRIDGED_DNAT 0x02
+ #define BRNF_DONT_TAKE_PARENT 0x04
+
enum nf_br_hook_priorities {
NF_BR_PRI_FIRST = INT_MIN,
NF_BR_PRI_NAT_DST_BRIDGED = -300,
+ NF_BR_PRI_FILTER_BRIDGED = -200,
+ NF_BR_PRI_BRNF = 0,
NF_BR_PRI_NAT_DST_OTHER = 100,
+ NF_BR_PRI_FILTER_OTHER = 200,
NF_BR_PRI_NAT_SRC = 300,
NF_BR_PRI_LAST = INT_MAX,
};
+ #ifdef CONFIG_NETFILTER
+ static inline
+ struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
+ {
+ struct nf_bridge_info **nf_bridge = &(skb->nf_bridge);
+
+ if ((*nf_bridge = kmalloc(sizeof(**nf_bridge), GFP_ATOMIC)) != NULL) {
+ atomic_set(&(*nf_bridge)->use, 1);
+ (*nf_bridge)->mask = 0;
+ (*nf_bridge)->physindev = (*nf_bridge)->physoutdev = NULL;
+ }
+
+ return *nf_bridge;
+ }
+
+ struct bridge_skb_cb {
+ union {
+ __u32 ipv4;
+ } daddr;
+ };
+ #endif /* CONFIG_NETFILTER */
+
+ #endif /* __KERNEL__ */
#endif
[root@SKIP-MORGAN linux-2.4.20]# cat net/bridge/br_private.h.rej
***************
*** 166,171 ****
int *ifindices);
/* br_input.c */
extern int br_handle_frame(struct sk_buff *skb);
/* br_ioctl.c */
--- 168,174 ----
int *ifindices);
/* br_input.c */
+ extern int br_handle_frame_finish(struct sk_buff *skb);
extern int br_handle_frame(struct sk_buff *skb);
/* br_ioctl.c */
[root@SKIP-MORGAN linux-2.4.20]# exit
Script done on Thu Feb 6 15:42:03 2003
_______________________________________________
Bridge mailing list
[EMAIL PROTECTED]
http://www.math.leidenuniv.nl/mailman/listinfo/bridge
