Commit 24c93443 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Use macros to define port statistics size and offset. 



The port statistics structures have hard coded padding and offset.
Define macros to make this look cleaner.

Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bfc6e5fb

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+4 −4
Original line number Diff line number Diff line
@@ -3788,8 +3788,7 @@ static int bnxt_alloc_stats(struct bnxt *bp) 
	if (bp->hw_rx_port_stats)

		goto alloc_ext_stats;



	bp->hw_port_stats_size = sizeof(struct rx_port_stats) +

				 sizeof(struct tx_port_stats) + 1024;

	bp->hw_port_stats_size = BNXT_PORT_STATS_SIZE;



	bp->hw_rx_port_stats =

		dma_alloc_coherent(&pdev->dev, bp->hw_port_stats_size,
@@ -3798,9 +3797,10 @@ static int bnxt_alloc_stats(struct bnxt *bp) 
	if (!bp->hw_rx_port_stats)

		return -ENOMEM;



	bp->hw_tx_port_stats = (void *)(bp->hw_rx_port_stats + 1) + 512;

	bp->hw_tx_port_stats = (void *)bp->hw_rx_port_stats +

			       BNXT_TX_PORT_STATS_BYTE_OFFSET;

	bp->hw_tx_port_stats_map = bp->hw_rx_port_stats_map +

				   sizeof(struct rx_port_stats) + 512;

				   BNXT_TX_PORT_STATS_BYTE_OFFSET;

	bp->flags |= BNXT_FLAG_PORT_STATS;



alloc_ext_stats:

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+7 −1
Original line number Diff line number Diff line
@@ -1926,12 +1926,18 @@ struct bnxt { 
	struct device		*hwmon_dev;

};



#define BNXT_PORT_STATS_SIZE				\

	(sizeof(struct rx_port_stats) + sizeof(struct tx_port_stats) + 1024)



#define BNXT_TX_PORT_STATS_BYTE_OFFSET			\

	(sizeof(struct rx_port_stats) + 512)



#define BNXT_RX_STATS_OFFSET(counter)			\

	(offsetof(struct rx_port_stats, counter) / 8)



#define BNXT_TX_STATS_OFFSET(counter)			\

	((offsetof(struct tx_port_stats, counter) +	\

	  sizeof(struct rx_port_stats) + 512) / 8)

	  BNXT_TX_PORT_STATS_BYTE_OFFSET) / 8)



#define BNXT_RX_STATS_EXT_OFFSET(counter)		\

	(offsetof(struct rx_port_stats_ext, counter) / 8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE