2 files changed, 19 insertions, 0 deletions

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 73502fef8769..7206ab2cbbf8 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -3203,6 +3203,10 @@ static int cas_get_vpd_info(struct cas *cp, unsigned char *dev_addr,
         int phy_type = CAS_PHY_MII_MDIO0; /* default phy type */
         int mac_off  = 0;
 
+#if defined(CONFIG_OF)
+        const unsigned char *addr;
+#endif
+
         /* give us access to the PROM */
         writel(BIM_LOCAL_DEV_PROM | BIM_LOCAL_DEV_PAD,
                cp->regs + REG_BIM_LOCAL_DEV_EN);
@@ -3350,6 +3354,14 @@ use_random_mac_addr:
         if (found & VPD_FOUND_MAC)
                 goto done;
 
+#if defined(CONFIG_OF)
+        addr = of_get_property(cp->of_node, "local-mac-address", NULL);
+        if (addr != NULL) {
+                memcpy(dev_addr, addr, 6);
+                goto done;
+        }
+#endif
+
         /* Sun MAC prefix then 3 random bytes. */
         pr_info("MAC address not found in ROM VPD\n");
         dev_addr[0] = 0x08;
@@ -5019,6 +5031,10 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         cp->msg_enable = (cassini_debug < 0) ? CAS_DEF_MSG_ENABLE :
           cassini_debug;
 
+#if defined(CONFIG_OF)
+        cp->of_node = pci_device_to_OF_node(pdev);
+#endif
+
         cp->link_transition = LINK_TRANSITION_UNKNOWN;
         cp->link_transition_jiffies_valid = 0;
 
diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h
index dbc47878d83b..faf4746a0f3e 100644
--- a/drivers/net/cassini.h
+++ b/drivers/net/cassini.h
@@ -2868,6 +2868,9 @@ struct cas {
         dma_addr_t block_dvma, tx_tiny_dvma[N_TX_RINGS];
         struct pci_dev *pdev;
         struct net_device *dev;
+#if defined(CONFIG_OF)
+        struct device_node      *of_node;
+#endif
 
         /* Firmware Info */
         u16                     fw_load_addr;