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

Commit d5c48582 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller
Browse files

amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict 



MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc
architecture.  Rename this #define in xgbe.h to avoid the
redefined warning issued during compilation.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 581d9baa

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ static int xgbe_probe(struct platform_device *pdev) 
	DBGPR("--> xgbe_probe\n");

	DBGPR("--> xgbe_probe\n");





	netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data),

	netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data),

				   MAX_DMA_CHANNELS);

				   XGBE_MAX_DMA_CHANNELS);

	if (!netdev) {

	if (!netdev) {

		dev_err(dev, "alloc_etherdev failed\n");

		dev_err(dev, "alloc_etherdev failed\n");

		ret = -ENOMEM;

		ret = -ENOMEM;

drivers/net/ethernet/amd/xgbe/xgbe.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ 
#define RX_MIN_BUF_SIZE		(ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)

#define RX_MIN_BUF_SIZE		(ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)

#define RX_BUF_ALIGN		64

#define RX_BUF_ALIGN		64





#define MAX_DMA_CHANNELS	16

#define XGBE_MAX_DMA_CHANNELS	16

#define DMA_ARDOMAIN_SETTING	0x2

#define DMA_ARDOMAIN_SETTING	0x2

#define DMA_ARCACHE_SETTING	0xb

#define DMA_ARCACHE_SETTING	0xb

#define DMA_AWDOMAIN_SETTING	0x2

#define DMA_AWDOMAIN_SETTING	0x2