diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-16 04:11:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-16 04:11:33 -0700 |
| commit | 8836286da1c88d2180d1d433a9c3a9c0d6b7253e (patch) | |
| tree | 587e67bda94f5924a1a2bf534073a80a8ede1a65 /include | |
| parent | 6b29059af3cb8607e055c5051c608a876572cdf7 (diff) | |
| parent | 4e75852fc7481bbf4055d60e277840fec449f227 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include')
| -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 |