[PATCH net] geneve: Fix IPv6 xmit stats update.

[PATCH net] geneve: Fix IPv6 xmit stats update.

[Pravin B Shelar]

Call to iptunnel_xmit_stats() is not required after udp-tunnel6-xmit.
By calling iptunnel_xmit_stats() results in incorrect device stats.
Following patch drops this call.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
 drivers/net/geneve.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index de5c30c..c2b79f5 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -967,8 +967,6 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
 	err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
 				   &fl6.saddr, &fl6.daddr, prio, ttl,
 				   sport, geneve->dst_port, !udp_csum);
-
-	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
 	return NETDEV_TX_OK;
 
 tx_error:
-- 
1.7.1

Re: [PATCH net] geneve: Fix IPv6 xmit stats update.

[John W. Linville]

On Mon, Dec 07, 2015 at 07:17:30PM -0800, Pravin B Shelar wrote:
> Call to iptunnel_xmit_stats() is not required after udp-tunnel6-xmit.
> By calling iptunnel_xmit_stats() results in incorrect device stats.
> Following patch drops this call.
> 
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
> ---
>  drivers/net/geneve.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
> index de5c30c..c2b79f5 100644
> --- a/drivers/net/geneve.c
> +++ b/drivers/net/geneve.c
> @@ -967,8 +967,6 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
>  	err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
>  				   &fl6.saddr, &fl6.daddr, prio, ttl,
>  				   sport, geneve->dst_port, !udp_csum);
> -
> -	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
>  	return NETDEV_TX_OK;
>  
>  tx_error:

So udp_tunnel_xmit_skb and udp_tunnel6_xmit_skb are different in this
regard? It seems so -- who knew? :-)

_Should_ they be different in this regard?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH net] geneve: Fix IPv6 xmit stats update.

[Pravin Shelar]

On Tue, Dec 8, 2015 at 6:54 AM, John W. Linville <linville@tuxdriver.com> wrote:
> On Mon, Dec 07, 2015 at 07:17:30PM -0800, Pravin B Shelar wrote:
>> Call to iptunnel_xmit_stats() is not required after udp-tunnel6-xmit.
>> By calling iptunnel_xmit_stats() results in incorrect device stats.
>> Following patch drops this call.
>>
>> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
>> ---
>>  drivers/net/geneve.c |    2 --
>>  1 files changed, 0 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
>> index de5c30c..c2b79f5 100644
>> --- a/drivers/net/geneve.c
>> +++ b/drivers/net/geneve.c
>> @@ -967,8 +967,6 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
>>       err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
>>                                  &fl6.saddr, &fl6.daddr, prio, ttl,
>>                                  sport, geneve->dst_port, !udp_csum);
>> -
>> -     iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
>>       return NETDEV_TX_OK;
>>
>>  tx_error:
>
> So udp_tunnel_xmit_skb and udp_tunnel6_xmit_skb are different in this
> regard? It seems so -- who knew? :-)
>
> _Should_ they be different in this regard?
>

I am planing on sending a patch to make these APIs consistent.

Re: [PATCH net] geneve: Fix IPv6 xmit stats update.

[David Miller]

From: Pravin B Shelar <pshelar@nicira.com>
Date: Mon,  7 Dec 2015 19:17:30 -0800

> Call to iptunnel_xmit_stats() is not required after udp-tunnel6-xmit.
> By calling iptunnel_xmit_stats() results in incorrect device stats.
> Following patch drops this call.
> 
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>

Applied, thanks Pravin.