diff options
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r-- | net/bridge/br_input.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index a82dde2d2ead..d36e700f7a26 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
@@ -24,14 +24,16 @@ const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; | |||
24 | static int br_pass_frame_up(struct sk_buff *skb) | 24 | static int br_pass_frame_up(struct sk_buff *skb) |
25 | { | 25 | { |
26 | struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev; | 26 | struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev; |
27 | struct net_bridge *br = netdev_priv(brdev); | ||
28 | struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats); | ||
27 | 29 | ||
28 | brdev->stats.rx_packets++; | 30 | brstats->rx_packets++; |
29 | brdev->stats.rx_bytes += skb->len; | 31 | brstats->rx_bytes += skb->len; |
30 | 32 | ||
31 | indev = skb->dev; | 33 | indev = skb->dev; |
32 | skb->dev = brdev; | 34 | skb->dev = brdev; |
33 | 35 | ||
34 | 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, |
35 | netif_receive_skb); | 37 | netif_receive_skb); |
36 | } | 38 | } |
37 | 39 | ||
@@ -154,7 +156,7 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb) | |||
154 | if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) | 156 | if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) |
155 | goto forward; | 157 | goto forward; |
156 | 158 | ||
157 | 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, |
158 | NULL, br_handle_local_finish)) | 160 | NULL, br_handle_local_finish)) |
159 | return NULL; /* frame consumed by filter */ | 161 | return NULL; /* frame consumed by filter */ |
160 | else | 162 | else |
@@ -175,7 +177,7 @@ forward: | |||
175 | if (!compare_ether_addr(p->br->dev->dev_addr, dest)) | 177 | if (!compare_ether_addr(p->br->dev->dev_addr, dest)) |
176 | skb->pkt_type = PACKET_HOST; | 178 | skb->pkt_type = PACKET_HOST; |
177 | 179 | ||
178 | 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, |
179 | br_handle_frame_finish); | 181 | br_handle_frame_finish); |
180 | break; | 182 | break; |
181 | default: | 183 | default: |