diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-21 03:19:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:25 -0500 |
commit | 7bd38d778e3f2250e96fc277040879d66c30ecb4 (patch) | |
tree | 555dbdf5c1cccc29710e53a428d979384451b05a /net/8021q/vlan_dev.c | |
parent | b7a4a83629c1ddde8c2e6a872618c66577cb20f0 (diff) |
[VLAN]: Use dev->stats
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r-- | net/8021q/vlan_dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 4f99bb86af5c..9543e9182796 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -174,7 +174,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
174 | skb->dev->last_rx = jiffies; | 174 | skb->dev->last_rx = jiffies; |
175 | 175 | ||
176 | /* Bump the rx counters for the VLAN device. */ | 176 | /* Bump the rx counters for the VLAN device. */ |
177 | stats = vlan_dev_get_stats(skb->dev); | 177 | stats = &skb->dev->stats; |
178 | stats->rx_packets++; | 178 | stats->rx_packets++; |
179 | stats->rx_bytes += skb->len; | 179 | stats->rx_bytes += skb->len; |
180 | 180 | ||
@@ -422,7 +422,7 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, | |||
422 | skb = skb_realloc_headroom(sk_tmp, dev->hard_header_len); | 422 | skb = skb_realloc_headroom(sk_tmp, dev->hard_header_len); |
423 | kfree_skb(sk_tmp); | 423 | kfree_skb(sk_tmp); |
424 | if (skb == NULL) { | 424 | if (skb == NULL) { |
425 | struct net_device_stats *stats = vlan_dev_get_stats(vdev); | 425 | struct net_device_stats *stats = &vdev->stats; |
426 | stats->tx_dropped++; | 426 | stats->tx_dropped++; |
427 | return -ENOMEM; | 427 | return -ENOMEM; |
428 | } | 428 | } |
@@ -453,7 +453,7 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, | |||
453 | 453 | ||
454 | int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | 454 | int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) |
455 | { | 455 | { |
456 | struct net_device_stats *stats = vlan_dev_get_stats(dev); | 456 | struct net_device_stats *stats = &dev->stats; |
457 | struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); | 457 | struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); |
458 | 458 | ||
459 | /* Handle non-VLAN frames if they are sent to us, for example by DHCP. | 459 | /* Handle non-VLAN frames if they are sent to us, for example by DHCP. |
@@ -514,7 +514,7 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
514 | 514 | ||
515 | int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | 515 | int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) |
516 | { | 516 | { |
517 | struct net_device_stats *stats = vlan_dev_get_stats(dev); | 517 | struct net_device_stats *stats = &dev->stats; |
518 | unsigned short veth_TCI; | 518 | unsigned short veth_TCI; |
519 | 519 | ||
520 | /* Construct the second two bytes. This field looks something | 520 | /* Construct the second two bytes. This field looks something |