diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-08-10 17:14:59 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-08-10 17:14:59 +0200 |
| commit | dc05a564ab1b3a1957927da50912964b61f7da69 (patch) | |
| tree | 489905675f9954e5bf160a2eff6ea6ce93472d61 /net/bridge | |
| parent | be39ee11cd1f67b51ac8e71d177a981eb34f2ab2 (diff) | |
| parent | e2fe35c17fed62d4ab5038fa9bc489e967ff8416 (diff) | |
| download | talos-obmc-linux-dc05a564ab1b3a1957927da50912964b61f7da69.tar.gz talos-obmc-linux-dc05a564ab1b3a1957927da50912964b61f7da69.zip | |
Merge branch 'master' of git://dev.medozas.de/linux
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtable_filter.c | 6 | ||||
| -rw-r--r-- | net/bridge/netfilter/ebtable_nat.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c index a5eea72938a6..4b988db3cd4d 100644 --- a/net/bridge/netfilter/ebtable_filter.c +++ b/net/bridge/netfilter/ebtable_filter.c @@ -77,21 +77,21 @@ static struct nf_hook_ops ebt_ops_filter[] __read_mostly = { { .hook = ebt_in_hook, .owner = THIS_MODULE, - .pf = PF_BRIDGE, + .pf = NFPROTO_BRIDGE, .hooknum = NF_BR_LOCAL_IN, .priority = NF_BR_PRI_FILTER_BRIDGED, }, { .hook = ebt_in_hook, .owner = THIS_MODULE, - .pf = PF_BRIDGE, + .pf = NFPROTO_BRIDGE, .hooknum = NF_BR_FORWARD, .priority = NF_BR_PRI_FILTER_BRIDGED, }, { .hook = ebt_out_hook, .owner = THIS_MODULE, - .pf = PF_BRIDGE, + .pf = NFPROTO_BRIDGE, .hooknum = NF_BR_LOCAL_OUT, .priority = NF_BR_PRI_FILTER_OTHER, }, diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c index 6024c551f9a9..4a98804203b0 100644 --- a/net/bridge/netfilter/ebtable_nat.c +++ b/net/bridge/netfilter/ebtable_nat.c @@ -77,21 +77,21 @@ static struct nf_hook_ops ebt_ops_nat[] __read_mostly = { { .hook = ebt_nat_out, .owner = THIS_MODULE, - .pf = PF_BRIDGE, + .pf = NFPROTO_BRIDGE, .hooknum = NF_BR_LOCAL_OUT, .priority = NF_BR_PRI_NAT_DST_OTHER, }, { .hook = ebt_nat_out, .owner = THIS_MODULE, - .pf = PF_BRIDGE, + .pf = NFPROTO_BRIDGE, .hooknum = NF_BR_POST_ROUTING, .priority = NF_BR_PRI_NAT_SRC, }, { .hook = ebt_nat_in, .owner = THIS_MODULE, - .pf = PF_BRIDGE, + .pf = NFPROTO_BRIDGE, .hooknum = NF_BR_PRE_ROUTING, .priority = NF_BR_PRI_NAT_DST_BRIDGED, }, |
