Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e6c9da3 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Remove ethtool stats member from dev struct 



This patch removes the ethtool stats member from the tg3 device
structure.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43598813

drivers/net/ethernet/broadcom/tg3.c

+7 −7
Original line number Diff line number Diff line
@@ -9770,7 +9770,8 @@ static int tg3_open(struct net_device *dev) 


static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *,

						 struct rtnl_link_stats64 *);

static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *);

static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *,

						struct tg3_ethtool_stats *);



static int tg3_close(struct net_device *dev)

{
@@ -9804,9 +9805,7 @@ static int tg3_close(struct net_device *dev) 
	tg3_ints_fini(tp);



	tg3_get_stats64(tp->dev, &tp->net_stats_prev);



	memcpy(&tp->estats_prev, tg3_get_estats(tp),

	       sizeof(tp->estats_prev));

	tg3_get_estats(tp, &tp->estats_prev);



	tg3_napi_fini(tp);
@@ -9854,9 +9853,9 @@ static u64 calc_crc_errors(struct tg3 *tp) 
	estats->member =	old_estats->member + \

				get_stat64(&hw_stats->member)



static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)

static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp,

					       struct tg3_ethtool_stats *estats)

{

	struct tg3_ethtool_stats *estats = &tp->estats;

	struct tg3_ethtool_stats *old_estats = &tp->estats_prev;

	struct tg3_hw_stats *hw_stats = tp->hw_stats;
@@ -10762,7 +10761,8 @@ static void tg3_get_ethtool_stats(struct net_device *dev, 
				   struct ethtool_stats *estats, u64 *tmp_stats)

{

	struct tg3 *tp = netdev_priv(dev);

	memcpy(tmp_stats, tg3_get_estats(tp), sizeof(tp->estats));



	tg3_get_estats(tp, (struct tg3_ethtool_stats *)tmp_stats);

}



static __be32 *tg3_vpd_readblock(struct tg3 *tp, u32 *vpdlen)

drivers/net/ethernet/broadcom/tg3.h

+0 −1
Original line number Diff line number Diff line
@@ -3013,7 +3013,6 @@ struct tg3 { 
	unsigned long			rx_dropped;

	unsigned long			tx_dropped;

	struct rtnl_link_stats64	net_stats_prev;

	struct tg3_ethtool_stats	estats;

	struct tg3_ethtool_stats	estats_prev;



	DECLARE_BITMAP(tg3_flags, TG3_FLAG_NUMBER_OF_FLAGS);