vserver 1.9.3

[linux-2.6.git] / drivers / net / 8139cp.c

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index da98366..1b18b3a 100644 (file)
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1546,7 +1546,6 @@ static struct ethtool_ops cp_ethtool_ops = {
 static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
 {
        struct cp_private *cp = netdev_priv(dev);
-       struct mii_ioctl_data *mii = (struct mii_ioctl_data *) &rq->ifr_data;
        int rc;
        unsigned long flags;
 
@@ -1554,7 +1553,7 @@ static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
                return -EINVAL;
 
        spin_lock_irqsave(&cp->lock, flags);
-       rc = generic_mii_ioctl(&cp->mii_if, mii, cmd, NULL);
+       rc = generic_mii_ioctl(&cp->mii_if, if_mii(rq), cmd, NULL);
        spin_unlock_irqrestore(&cp->lock, flags);
        return rc;
 }
@@ -1699,7 +1698,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        /* Configure DMA attributes. */
-       if ((sizeof(dma_addr_t) > 32) &&
+       if ((sizeof(dma_addr_t) > 4) &&
            !pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL) &&
            !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
                pci_using_dac = 1;