Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edd31476 authored by Merav Sicron's avatar Merav Sicron Committed by David S. Miller
Browse files

bnx2x: Set NETIF_F_HIGHDMA unconditionally 



Current driver implementation incorrectly sets the flag only if 64-bit
DMA mask succeeded.

Signed-off-by: default avatarMerav Sicron <meravs@broadcom.com>
Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4293b9f5

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+0 −1
Original line number Diff line number Diff line
@@ -1528,7 +1528,6 @@ struct bnx2x { 
#define PCI_32BIT_FLAG			(1 << 1)

#define ONE_PORT_FLAG			(1 << 2)

#define NO_WOL_FLAG			(1 << 3)

#define USING_DAC_FLAG			(1 << 4)

#define USING_MSIX_FLAG			(1 << 5)

#define USING_MSI_FLAG			(1 << 6)

#define DISABLE_MSI_FLAG		(1 << 7)

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −3
Original line number Diff line number Diff line
@@ -12118,7 +12118,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp) 
	struct device *dev = &bp->pdev->dev;



	if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {

		bp->flags |= USING_DAC_FLAG;

		if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {

			dev_err(dev, "dma_set_coherent_mask failed, aborting\n");

			return -EIO;
@@ -12286,7 +12285,6 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, 
		NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA;



	dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX;

	if (bp->flags & USING_DAC_FLAG)

	dev->features |= NETIF_F_HIGHDMA;



	/* Add Loopback capability to the device */