diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-05-21 14:13:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-21 14:13:47 -0700 |
| commit | a339f1c881fdb8092ef9b118610307e10e885fc8 (patch) | |
| tree | 117feec8162165b577d7030262da66e8ac6a5e83 /net/bridge/br_device.c | |
| parent | 96e74088f1da4d9a53735a4a57a4f984f86b75c6 (diff) | |
| download | lwn-a339f1c881fdb8092ef9b118610307e10e885fc8.tar.gz lwn-a339f1c881fdb8092ef9b118610307e10e885fc8.zip | |
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>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index bf7787395fe0..626c7795ae30 100644 --- 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; |