bridge: Use on-device stats instead of private ones.

Even though bridges require 6 fields from struct net_device_stats,
the on-device stats are always there, so we may just use them.

The br_dev_get_stats is no longer required after this.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index bf7787395fe09c17e25cbcea93f089386aad5af8..626c7795ae30edcdab4e5d6997995eff1e029942 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -21,12 +21,6 @@
 #include <asm/uaccess.h>
 #include "br_private.h"
 
-static struct net_device_stats *br_dev_get_stats(struct net_device *dev)
-{
-       struct net_bridge *br = netdev_priv(dev);
-       return &br->statistics;
-}
-
 /* net device transmit always called with no BH (preempt_disabled) */
 int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
@@ -34,8 +28,8 @@ int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
        const unsigned char *dest = skb->data;
        struct net_bridge_fdb_entry *dst;
 
-       br->statistics.tx_packets++;
-       br->statistics.tx_bytes += skb->len;
+       dev->stats.tx_packets++;
+       dev->stats.tx_bytes += skb->len;
 
        skb_reset_mac_header(skb);
        skb_pull(skb, ETH_HLEN);
@@ -161,7 +155,6 @@ void br_dev_setup(struct net_device *dev)
        ether_setup(dev);
 
        dev->do_ioctl = br_dev_ioctl;
-       dev->get_stats = br_dev_get_stats;
        dev->hard_start_xmit = br_dev_xmit;
        dev->open = br_dev_open;
        dev->set_multicast_list = br_dev_set_multicast_list;

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index bdd7c35c3c7ba870a618f359733a19197e61e758..a4711674b3df0470b53855b6ff5e2523a1958603 100644 (file)
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -115,7 +115,7 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
                                struct sk_buff *skb2;
 
                                if ((skb2 = skb_clone(skb, GFP_ATOMIC)) == NULL) {
-                                       br->statistics.tx_dropped++;
+                                       br->dev->stats.tx_dropped++;
                                        kfree_skb(skb);
                                        return;
                                }

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 255c00f60ce7a3a14a5b0089e440d2edf46403e1..fa0f5711a9961c9f0d24b286933fa42ea6485ed9 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -24,13 +24,13 @@ const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
 static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
 {
-       struct net_device *indev;
+       struct net_device *indev, *brdev = br->dev;
 
-       br->statistics.rx_packets++;
-       br->statistics.rx_bytes += skb->len;
+       brdev->stats.rx_packets++;
+       brdev->stats.rx_bytes += skb->len;
 
        indev = skb->dev;
-       skb->dev = br->dev;
+       skb->dev = brdev;
 
        NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
                netif_receive_skb);
@@ -64,7 +64,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
        dst = NULL;
 
        if (is_multicast_ether_addr(dest)) {
-               br->statistics.multicast++;
+               br->dev->stats.multicast++;
                skb2 = skb;
        } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
                skb2 = skb;

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index c11b554fd109d4f1b587c8b254a5352889a29b86..0243cb489eddf9e9f4d5042c7e5361ca6d3edcd2 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -90,7 +90,6 @@ struct net_bridge
        spinlock_t                      lock;
        struct list_head                port_list;
        struct net_device               *dev;
-       struct net_device_stats         statistics;
        spinlock_t                      hash_lock;
        struct hlist_head               hash[BR_HASH_SIZE];
        struct list_head                age_list;