VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / net / tlan.c

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 747f871..6454331 100644 (file)
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -212,7 +212,7 @@ MODULE_PARM_DESC(bbuf, "ThunderLAN use big buffer (0-1)");
 /* Define this to enable Link beat monitoring */
 #undef MONITOR
 
-/* Turn on debugging. See linux/Documentation/networking/tlan.txt for details */
+/* Turn on debugging. See Documentation/networking/tlan.txt for details */
 static  int            debug;
 
 static int             bbuf;
@@ -225,7 +225,7 @@ static  int tlan_have_eisa;
 
 const char *media[] = {
        "10BaseT-HD ", "10BaseT-FD ","100baseTx-HD ", 
-       "100baseTx-FD", "100baseT4", 0
+       "100baseTx-FD", "100baseT4", NULL
 };
 
 int media_map[] = { 0x0020, 0x0040, 0x0080, 0x0100, 0x0200,};
@@ -446,7 +446,9 @@ static void __devexit tlan_remove_one( struct pci_dev *pdev)
                pci_free_consistent(priv->pciDev, priv->dmaSize, priv->dmaStorage, priv->dmaStorageDMA );
        }
 
+#ifdef CONFIG_PCI
        pci_release_regions(pdev);
+#endif
        
        free_netdev( dev );
                
@@ -673,8 +675,10 @@ err_out_uninit:
 err_out_free_dev:
        free_netdev(dev);
 err_out_regions:
+#ifdef CONFIG_PCI
        if (pdev)
                pci_release_regions(pdev);
+#endif
 err_out:
        if (pdev)
                pci_disable_device(pdev);
@@ -980,7 +984,7 @@ static int TLan_Open( struct net_device *dev )
 static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
        TLanPrivateInfo *priv = dev->priv;
-       struct mii_ioctl_data *data = (struct mii_ioctl_data *)&rq->ifr_data;
+       struct mii_ioctl_data *data = if_mii(rq);
        u32 phy   = priv->phy[priv->phyNum];
        
        if (!priv->phyOnline)