[PATCH net-next] tg3: fix return value in tg3_get_stats64

[PATCH net-next] tg3: fix return value in tg3_get_stats64

[Govindarajulu Varadarajan]

When tp->hw_stats is 0, tg3_get_stats64 should display previously
recorded stats. So it returns &tp->net_stats_prev. But the caller,
dev_get_stats, ignores the return value.

Fix this by assigning tp->net_stats_prev to stats and returning stats.

Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>
---
 drivers/net/ethernet/broadcom/tg3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index a3dd5dc..4296b3d26 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14093,8 +14093,9 @@ static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,
 
 	spin_lock_bh(&tp->lock);
 	if (!tp->hw_stats) {
+		*stats = tp->net_stats_prev;
 		spin_unlock_bh(&tp->lock);
-		return &tp->net_stats_prev;
+		return stats;
 	}
 
 	tg3_get_nstats(tp, stats);
-- 
2.0.4

Re: [PATCH net-next] tg3: fix return value in tg3_get_stats64

[Prashant Sreedharan]

On Wed, 2014-08-13 at 13:04 +0530, Govindarajulu Varadarajan wrote:
> When tp->hw_stats is 0, tg3_get_stats64 should display previously
> recorded stats. So it returns &tp->net_stats_prev. But the caller,
> dev_get_stats, ignores the return value.
> 
> Fix this by assigning tp->net_stats_prev to stats and returning stats.
> 
> Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>

Acked-by: Prashant Sreedharan <prashant@broadcom.com>
> ---
>  drivers/net/ethernet/broadcom/tg3.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
> index a3dd5dc..4296b3d26 100644
> --- a/drivers/net/ethernet/broadcom/tg3.c
> +++ b/drivers/net/ethernet/broadcom/tg3.c
> @@ -14093,8 +14093,9 @@ static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,
>  
>  	spin_lock_bh(&tp->lock);
>  	if (!tp->hw_stats) {
> +		*stats = tp->net_stats_prev;
>  		spin_unlock_bh(&tp->lock);
> -		return &tp->net_stats_prev;
> +		return stats;
>  	}
>  
>  	tg3_get_nstats(tp, stats);

Re: [PATCH net-next] tg3: fix return value in tg3_get_stats64

[David Miller]

From: Govindarajulu Varadarajan <_govind@gmx.com>
Date: Wed, 13 Aug 2014 13:04:56 +0530

> When tp->hw_stats is 0, tg3_get_stats64 should display previously
> recorded stats. So it returns &tp->net_stats_prev. But the caller,
> dev_get_stats, ignores the return value.
> 
> Fix this by assigning tp->net_stats_prev to stats and returning stats.
> 
> Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>

Applied, but please target 'net' for bug fixes in the future.

Thanks.