diff options
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index e7f4c1d02f57..d36e700f7a26 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
| @@ -33,7 +33,7 @@ static int br_pass_frame_up(struct sk_buff *skb) | |||
| 33 | indev = skb->dev; | 33 | indev = skb->dev; |
| 34 | skb->dev = brdev; | 34 | skb->dev = brdev; |
| 35 | 35 | ||
| 36 | return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, | 36 | return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, |
| 37 | netif_receive_skb); | 37 | netif_receive_skb); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| @@ -156,7 +156,7 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb) | |||
| 156 | if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) | 156 | if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) |
| 157 | goto forward; | 157 | goto forward; |
| 158 | 158 | ||
| 159 | if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, | 159 | if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, |
| 160 | NULL, br_handle_local_finish)) | 160 | NULL, br_handle_local_finish)) |
| 161 | return NULL; /* frame consumed by filter */ | 161 | return NULL; /* frame consumed by filter */ |
| 162 | else | 162 | else |
| @@ -177,7 +177,7 @@ forward: | |||
| 177 | if (!compare_ether_addr(p->br->dev->dev_addr, dest)) | 177 | if (!compare_ether_addr(p->br->dev->dev_addr, dest)) |
| 178 | skb->pkt_type = PACKET_HOST; | 178 | skb->pkt_type = PACKET_HOST; |
| 179 | 179 | ||
| 180 | NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, | 180 | NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, |
| 181 | br_handle_frame_finish); | 181 | br_handle_frame_finish); |
| 182 | break; | 182 | break; |
| 183 | default: | 183 | default: |
