projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddcde70
)
net: bnx2x: avoid macro redefinition
author
David Decotigny
<
[email protected]
>
Sun, 11 Jan 2015 19:42:37 +0000
(11:42 -0800)
committer
David S. Miller
<
[email protected]
>
Mon, 12 Jan 2015 21:51:15 +0000
(16:51 -0500)
Signed-off-by: David Decotigny <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 792ba72fb5c815cded9d20cc01024e7c7678f380..756053c028becff93c62cfcdbd6e1f635594cc01 100644
(file)
--- 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;