These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / broadcom / b44.h

diff --git a/kernel/drivers/net/ethernet/broadcom/b44.h b/kernel/drivers/net/ethernet/broadcom/b44.h
index 3e9c3fc..65d88d7 100644 (file)
--- a/kernel/drivers/net/ethernet/broadcom/b44.h
+++ b/kernel/drivers/net/ethernet/broadcom/b44.h
@@ -1,6 +1,8 @@
 #ifndef _B44_H
 #define _B44_H
 
+#include <linux/brcmphy.h>
+
 /* Register layout. (These correspond to struct _bcmenettregs in bcm4400.) */
 #define        B44_DEVCTRL     0x0000UL /* Device Control */
 #define  DEVCTRL_MPM           0x00000040 /* Magic Packet PME Enable (B0 only) */
@@ -281,8 +283,10 @@ struct ring_info {
 };
 
 #define B44_MCAST_TABLE_SIZE           32
-#define B44_PHY_ADDR_NO_LOCAL_PHY      30 /* no local phy regs */
-#define B44_PHY_ADDR_NO_PHY            31 /* no phy present at all */
+/* no local phy regs, e.g: Broadcom switches pseudo-PHY */
+#define B44_PHY_ADDR_NO_LOCAL_PHY      BRCM_PSEUDO_PHY_ADDR
+/* no phy present at all */
+#define B44_PHY_ADDR_NO_PHY            31
 #define B44_MDC_RATIO                  5000000
 
 #define        B44_STAT_REG_DECLARE            \