diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-17 06:30:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-17 06:30:50 -0700 |
| commit | b12d2ca2d6d8f24357682fff7a0777d65b534b10 (patch) | |
| tree | 6f8490a3eaba311ed56f6a794057d90016b5ac51 /include/linux | |
| parent | 18cddbe6c6858dd2a1d6bd60798d08da8d367f3e (diff) | |
| parent | 78a10cc536ff75e2fa3e791deb2d2d06f8e7b3f9 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_bridge.h | 3 | ||||
| -rw-r--r-- | include/linux/netfilter_bridge.h | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 2b0aa1e9d698..77b3c632f118 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -102,7 +102,8 @@ struct net_bridge; struct net_bridge_port; extern int (*br_ioctl_hook)(unsigned long arg); -extern void (*br_handle_frame_hook)(struct sk_buff *skb); +extern int (*br_handle_frame_hook)(struct sk_buff *skb); +extern int (*br_should_route_hook)(struct sk_buff **pskb); #endif diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index f553673ba2b4..3c271c65679a 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -18,7 +18,18 @@ #define NF_BR_LOCAL_OUT 3 /* Packets about to hit the wire. */ #define NF_BR_POST_ROUTING 4 -#define NF_BR_NUMHOOKS 5 +/* Not really a hook, but used for the ebtables broute table */ +#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 |