From: Tom Lendacky <thomas.lendacky@amd.com>
To: David Laight <David.Laight@ACULAB.COM>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"fengguang.wu@intel.com" <fengguang.wu@intel.com>,
"davem@davemloft.net" <davem@davemloft.net>
Cc: "kbuild-all@01.org" <kbuild-all@01.org>,
"jet.chen@intel.com" <jet.chen@intel.com>
Subject: Re: [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict
Date: Mon, 9 Jun 2014 10:17:38 -0500 [thread overview]
Message-ID: <5395D012.9060804@amd.com> (raw)
In-Reply-To: <063D6719AE5E284EB5DD2968C1650D6D17259A7D@AcuExch.aculab.com>
On 06/09/2014 09:25 AM, David Laight wrote:
> 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.
>
I thought about that when creating this patch, but didn't want to
take it too far - just resolve the reported issue.
I'll submit a follow-on patch that renames the other defines if
that is acceptable.
Thanks,
Tom
> David
>
next prev parent reply other threads:[~2014-06-09 15:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-09 14:19 [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict Tom Lendacky
2014-06-09 14:25 ` David Laight
2014-06-09 15:17 ` Tom Lendacky [this message]
2014-06-10 13:07 ` Tom Lendacky
2014-06-11 7:57 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5395D012.9060804@amd.com \
--to=thomas.lendacky@amd.com \
--cc=David.Laight@ACULAB.COM \
--cc=davem@davemloft.net \
--cc=fengguang.wu@intel.com \
--cc=jet.chen@intel.com \
--cc=kbuild-all@01.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.