From: Thomas Bogendoerfer <tbogendoerfer@suse.de>
To: Ralf Baechle <ralf@linux-mips.org>,
"David S. Miller" <davem@davemloft.net>,
linux-mips@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>
Subject: [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA
Date: Sun, 3 Nov 2019 11:34:33 +0100 [thread overview]
Message-ID: <20191103103433.26826-4-tbogendoerfer@suse.de> (raw)
In-Reply-To: <20191103103433.26826-1-tbogendoerfer@suse.de>
From: Christoph Hellwig <hch@lst.de>
Set NETIF_F_HIGHDMA together with the NETIF_F_IP_CSUM flag insted of
letting the second assignment overwrite it. Probably doesn't matter
in practice as none of the systems a IOC3 is usually found in has
highmem to start with.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 83abc8a13508..d242906ae233 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1193,8 +1193,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;
@@ -1278,7 +1276,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);
--
2.16.4
next prev parent reply other threads:[~2019-11-03 10:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-03 10:34 [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 2/4] net: sgi: ioc3-eth: fix usage of GFP_* flags Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 3/4] net: sgi: ioc3-eth: simplify setting the DMA mask Thomas Bogendoerfer
2019-11-03 18:41 ` Sergei Shtylyov
2019-11-03 10:34 ` Thomas Bogendoerfer [this message]
2019-11-03 18:45 ` [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA Sergei Shtylyov
2019-11-04 0:34 ` [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Christoph Hellwig
2019-11-04 0:45 ` (metabare) net: sgi: ioc3-eth Carlo Pisani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191103103433.26826-4-tbogendoerfer@suse.de \
--to=tbogendoerfer@suse.de \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®