diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-06-27 23:12:39 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-29 12:29:39 -0700 |
| commit | 3c18cbe33711d7f46aa3787c79ff809011f54b40 (patch) | |
| tree | f34176a178b697bb83d0ab52169ac8c03fa001cb /drivers/net | |
| parent | r8169: improve handling VLAN tag (diff) | |
| download | linux-dev-3c18cbe33711d7f46aa3787c79ff809011f54b40.tar.xz linux-dev-3c18cbe33711d7f46aa3787c79ff809011f54b40.zip | |
r8169: consider that 32 Bit DMA is the default
Documentation/DMA-API-HOWTO.txt states:
By default, the kernel assumes that your device can address 32-bits of
DMA addressing. For a 64-bit capable device, this needs to be increased,
and for a device with limitations, it needs to be decreased.
Therefore we don't need the 32 Bit DMA fallback configuration and can
remove it.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index b4df66befc16..1b5f125e1b6c 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -6724,15 +6724,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->cp_cmd = RTL_R16(tp, CPlusCmd); if (sizeof(dma_addr_t) > 4 && tp->mac_version >= RTL_GIGA_MAC_VER_18 && - !dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) { + !dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) dev->features |= NETIF_F_HIGHDMA; - } else { - rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); - if (rc < 0) { - dev_err(&pdev->dev, "DMA configuration failed\n"); - return rc; - } - } rtl_init_rxcfg(tp); |