From: David Decotigny <ddecotig@gmail.com>
To: Ariel Elior <ariel.elior@qlogic.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: David Decotigny <decot@googlers.com>
Subject: [PATCH net-next v1] net: bnx2x: avoid macro redefinition
Date: Sun, 11 Jan 2015 11:42:37 -0800 [thread overview]
Message-ID: <1421005357-25708-1-git-send-email-ddecotig@gmail.com> (raw)
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 792ba72..756053c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1138,12 +1138,8 @@ struct bnx2x_port {
u32 link_config[LINK_CONFIG_SIZE];
u32 supported[LINK_CONFIG_SIZE];
-/* link settings - missing defines */
-#define SUPPORTED_2500baseX_Full (1 << 15)
u32 advertising[LINK_CONFIG_SIZE];
-/* link settings - missing defines */
-#define ADVERTISED_2500baseX_Full (1 << 15)
u32 phy_addr;
--
2.2.0.rc0.207.ga3a616c
next reply other threads:[~2015-01-11 19:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-11 19:42 David Decotigny [this message]
2015-01-12 22:02 ` [PATCH net-next v1] net: bnx2x: avoid macro redefinition 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=1421005357-25708-1-git-send-email-ddecotig@gmail.com \
--to=ddecotig@gmail.com \
--cc=ariel.elior@qlogic.com \
--cc=decot@googlers.com \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).