Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / net / bridge / br_input.c
index a82dde2..e7f4c1d 100644 (file)
@@ -24,9 +24,11 @@ const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 static int br_pass_frame_up(struct sk_buff *skb)
 {
        struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
+       struct net_bridge *br = netdev_priv(brdev);
+       struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats);
 
-       brdev->stats.rx_packets++;
-       brdev->stats.rx_bytes += skb->len;
+       brstats->rx_packets++;
+       brstats->rx_bytes += skb->len;
 
        indev = skb->dev;
        skb->dev = brdev;