diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-04 16:38:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-04 16:38:31 -0400 |
| commit | e990b37b906b6137d353ef2a918e15e5763d70ec (patch) | |
| tree | e802458ee43d4b0a2b6d39eb25929858ceb7fd61 /net/8021q | |
| parent | 34624d6631b6b3a1df16407a847286bb6233a96b (diff) | |
| parent | 23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 4225e24d0c21..1c9aa8c6a77d 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -167,7 +167,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, | |||
| 167 | u64_stats_update_begin(&stats->syncp); | 167 | u64_stats_update_begin(&stats->syncp); |
| 168 | stats->tx_packets++; | 168 | stats->tx_packets++; |
| 169 | stats->tx_bytes += len; | 169 | stats->tx_bytes += len; |
| 170 | u64_stats_update_begin(&stats->syncp); | 170 | u64_stats_update_end(&stats->syncp); |
| 171 | } else { | 171 | } else { |
| 172 | this_cpu_inc(vlan_dev_info(dev)->vlan_pcpu_stats->tx_dropped); | 172 | this_cpu_inc(vlan_dev_info(dev)->vlan_pcpu_stats->tx_dropped); |
| 173 | } | 173 | } |