net: rtl8169: fix switching between adapters

[karo-tx-uboot.git] / drivers / net / rtl8169.c

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 163b9df55c9b164b75170826bf28d31030a4e085..843b083f8f90460b9992f9f232003a06bc82b119 100644 (file)
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -850,9 +850,11 @@ static void rtl8169_init_ring(pci_dev_t dev)
 }
 
 #ifdef CONFIG_DM_ETH
-static void rtl8169_common_start(struct udevice *dev, unsigned char *enetaddr)
+static void rtl8169_common_start(struct udevice *dev, unsigned char *enetaddr,
+                                unsigned long dev_iobase)
 #else
-static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr)
+static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr,
+                                unsigned long dev_iobase)
 #endif
 {
        int i;
@@ -862,6 +864,8 @@ static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr)
        printf ("%s\n", __FUNCTION__);
 #endif
 
+       ioaddr = dev_iobase;
+
        rtl8169_init_ring(dev);
        rtl8169_hw_start(dev);
        /* Construct a perfect filter frame with the mac address as first match
@@ -885,8 +889,9 @@ static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr)
 static int rtl8169_eth_start(struct udevice *dev)
 {
        struct eth_pdata *plat = dev_get_platdata(dev);
+       struct rtl8169_private *priv = dev_get_priv(dev);
 
-       rtl8169_common_start(dev, plat->enetaddr);
+       rtl8169_common_start(dev, plat->enetaddr, priv->iobase);
 
        return 0;
 }
@@ -897,7 +902,7 @@ RESET - Finish setting up the ethernet interface
 static int rtl_reset(struct eth_device *dev, bd_t *bis)
 {
        rtl8169_common_start((pci_dev_t)(unsigned long)dev->priv,
-                            dev->enetaddr);
+                            dev->enetaddr, dev->iobase);
 
        return 0;
 }