* [PATCH net-next v1] net: bnx2x: avoid macro redefinition
@ 2015-01-11 19:42 David Decotigny
2015-01-12 22:02 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: David Decotigny @ 2015-01-11 19:42 UTC (permalink / raw)
To: Ariel Elior, netdev, linux-kernel; +Cc: David Decotigny
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next v1] net: bnx2x: avoid macro redefinition
2015-01-11 19:42 [PATCH net-next v1] net: bnx2x: avoid macro redefinition David Decotigny
@ 2015-01-12 22:02 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-01-12 22:02 UTC (permalink / raw)
To: ddecotig; +Cc: ariel.elior, netdev, linux-kernel, decot
From: David Decotigny <ddecotig@gmail.com>
Date: Sun, 11 Jan 2015 11:42:37 -0800
> From: David Decotigny <decot@googlers.com>
>
> Signed-off-by: David Decotigny <decot@googlers.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-12 22:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-11 19:42 [PATCH net-next v1] net: bnx2x: avoid macro redefinition David Decotigny
2015-01-12 22:02 ` David Miller
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).