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

Commit 4e1d0de9 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2: Rename MSI-X vectors. 



Change MSI-X vector names to "ethx-%d".

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f40e0638

drivers/net/bnx2.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -5827,6 +5827,8 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) 
{

{

	int i, rc;

	int i, rc;

	struct msix_entry msix_ent[BNX2_MAX_MSIX_VEC];

	struct msix_entry msix_ent[BNX2_MAX_MSIX_VEC];

	struct net_device *dev = bp->dev;

	const int len = sizeof(bp->irq_tbl[0].name);





	bnx2_setup_msix_tbl(bp);

	bnx2_setup_msix_tbl(bp);

	REG_WR(bp, BNX2_PCI_MSIX_CONTROL, BNX2_MAX_MSIX_HW_VEC - 1);

	REG_WR(bp, BNX2_PCI_MSIX_CONTROL, BNX2_MAX_MSIX_HW_VEC - 1);
@@ -5837,7 +5839,7 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) 
		msix_ent[i].entry = i;

		msix_ent[i].entry = i;

		msix_ent[i].vector = 0;

		msix_ent[i].vector = 0;





		strcpy(bp->irq_tbl[i].name, bp->dev->name);

		snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);

		bp->irq_tbl[i].handler = bnx2_msi_1shot;

		bp->irq_tbl[i].handler = bnx2_msi_1shot;

	}

	}

drivers/net/bnx2.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -6627,7 +6627,7 @@ struct bnx2_irq { 
	irq_handler_t	handler;

	irq_handler_t	handler;

	unsigned int	vector;

	unsigned int	vector;

	u8		requested;

	u8		requested;

	char		name[16];

	char		name[IFNAMSIZ + 2];

};

};





struct bnx2_tx_ring_info {

struct bnx2_tx_ring_info {