Patchwork vlan: fix typo in vlan_dev_hard_start_xmit()

login
register
mail settings
Submitter Wei Yongjun
Date June 1, 2011, 8:53 a.m.
Message ID <4DE5FDFF.4000208@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/98149/
State Accepted
Delegated to: David Miller
Headers show

Comments

Wei Yongjun - June 1, 2011, 8:53 a.m.
commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 (vlan: lockless
transmit path) have a typo in vlan_dev_hard_start_xmit(), using
u64_stats_update_begin() to end the stat update, it should be
u64_stats_update_end().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
---
 net/8021q/vlan_dev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
WANG Cong - June 1, 2011, 1:54 p.m.
On Wed, 01 Jun 2011 16:53:19 +0800, Wei Yongjun wrote:

> commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 (vlan: lockless transmit
> path) have a typo in vlan_dev_hard_start_xmit(), using
> u64_stats_update_begin() to end the stat update, it should be
> u64_stats_update_end().
> 
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>

Yup, good catch!

Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet - June 1, 2011, 3:07 p.m.
Le mercredi 01 juin 2011 à 16:53 +0800, Wei Yongjun a écrit :
> commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 (vlan: lockless
> transmit path) have a typo in vlan_dev_hard_start_xmit(), using
> u64_stats_update_begin() to end the stat update, it should be
> u64_stats_update_end().
> 
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>

Good catch, Thanks !

Acked-by: Eric Dumazet <eric.dumazet@gmail.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 2, 2011, 4:09 a.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 01 Jun 2011 17:07:07 +0200

> Le mercredi 01 juin 2011 à 16:53 +0800, Wei Yongjun a écrit :
>> commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 (vlan: lockless
>> transmit path) have a typo in vlan_dev_hard_start_xmit(), using
>> u64_stats_update_begin() to end the stat update, it should be
>> u64_stats_update_end().
>> 
>> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
> 
> Good catch, Thanks !
> 
> Acked-by: Eric Dumazet <eric.dumazet@gmail.com>

Applied and queued up for -stable.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index f247f5b..7ea5cf9 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -165,7 +165,7 @@  static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
 		u64_stats_update_begin(&stats->syncp);
 		stats->tx_packets++;
 		stats->tx_bytes += len;
-		u64_stats_update_begin(&stats->syncp);
+		u64_stats_update_end(&stats->syncp);
 	} else {
 		this_cpu_inc(vlan_dev_info(dev)->vlan_pcpu_stats->tx_dropped);
 	}