Merge branch 'master' of git://dev.medozas.de/linux

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,
         },