netdev - RE: [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <063D6719AE5E284EB5DD2968C1650D6D17259A7D@AcuExch.aculab.com>
Date:	Mon, 9 Jun 2014 14:25:58 +0000
From:	David Laight <David.Laight@...LAB.COM>
To:	'Tom Lendacky' <thomas.lendacky@....com>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"fengguang.wu@...el.com" <fengguang.wu@...el.com>,
	"davem@...emloft.net" <davem@...emloft.net>
CC:	"kbuild-all@...org" <kbuild-all@...org>,
	"jet.chen@...el.com" <jet.chen@...el.com>
Subject: RE: [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc
 conflict

From: Tom Lendacky
> 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.
...
> --- a/drivers/net/ethernet/amd/xgbe/xgbe.h
> +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
> @@ -138,7 +138,7 @@
>  #define RX_MIN_BUF_SIZE		(ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
>  #define RX_BUF_ALIGN		64
> 
> -#define MAX_DMA_CHANNELS	16
> +#define XGBE_MAX_DMA_CHANNELS	16
>  #define DMA_ARDOMAIN_SETTING	0x2
>  #define DMA_ARCACHE_SETTING	0xb
>  #define DMA_AWDOMAIN_SETTING	0x2

Might be worthwhile changing the other names at the same time.

	David