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:
2729b42
)
bgmac: Utilize BRCM_PSEUDO_PHY_ADDR
author
Florian Fainelli
<
[email protected]
>
Thu, 11 Jun 2015 01:08:00 +0000
(18:08 -0700)
committer
David S. Miller
<
[email protected]
>
Thu, 11 Jun 2015 06:33:58 +0000
(23:33 -0700)
What BGMAC defines as BGMAC_PHY_NOREGS is in fact the Broadcom Ethernet
switches' pseudo-PHY address (30), utilize the newly introduced constant
from brcmphy.h
Signed-off-by: Florian Fainelli <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/broadcom/bgmac.h
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/bgmac.h
b/drivers/net/ethernet/broadcom/bgmac.h
index db27febbb215cdc68ecfa2e3c0cda54c6a4fbf33..4fbb093e0d844031dd86cc3d7253eb44d10686d6 100644
(file)
--- a/
drivers/net/ethernet/broadcom/bgmac.h
+++ b/
drivers/net/ethernet/broadcom/bgmac.h
@@
-13,6
+13,7
@@
dev_dbg(&(bgmac)->core->dev, fmt, ##__VA_ARGS__)
#include <linux/bcma/bcma.h>
+#include <linux/brcmphy.h>
#include <linux/netdevice.h>
#define BGMAC_DEV_CTL 0x000
@@
-349,7
+350,7
@@
#define BGMAC_DESC_CTL0_SOF 0x80000000 /* Start of frame */
#define BGMAC_DESC_CTL1_LEN 0x00001FFF
-#define BGMAC_PHY_NOREGS
0x1E
+#define BGMAC_PHY_NOREGS
BRCM_PSEUDO_PHY_ADDR
#define BGMAC_PHY_MASK 0x1F
#define BGMAC_MAX_TX_RINGS 4