net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA

Set NETIF_F_HIGHDMA together with the NETIF_F_IP_CSUM flag instead of
letting the second assignment overwrite it.  Probably doesn't matter
in practice as none of the systems an IOC3 is usually found in has
highmem to start with.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index dc2e22652b5574d9da466f418f1f6a9a7b7666d8..1af68826810a8d9bc928fa9eddc33c0c552b3f19 100644 (file)
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1192,8 +1192,6 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_disable;
        }
 
-       dev->features |= NETIF_F_HIGHDMA;
-
        err = pci_request_regions(pdev, "ioc3");
        if (err)
                goto out_free;
@@ -1274,7 +1272,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev->netdev_ops         = &ioc3_netdev_ops;
        dev->ethtool_ops        = &ioc3_ethtool_ops;
        dev->hw_features        = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
-       dev->features           = NETIF_F_IP_CSUM;
+       dev->features           = NETIF_F_IP_CSUM | NETIF_F_HIGHDMA;
 
        sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
        sw_physid2 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID2);