korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

qlcnic: Rename the IRQ description.

Browse Source 
Here's what modified vectors will look like
in the /proc/interrupts

        MSIx             	INTx
-----------------------------------------
83xx    qlcnic[MB]
	qlcnic-ethX[Rx0]
	qlcnic-ethX[Rx1]
	..
	qlcnic-ethX[RxN]
	qlcnic-ethx[Tx0]        qlcnic[MB+Tx0+Rx0]

82xx    qlcnic-ethX[Rx0]
	qlcnic-ethX[Rx1]
	..
	qlcnic-ethX[Tx0+RxN]    qlcnic-ethX[Tx0+Rx0]

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Himanshu Madhani 2013-04-24 12:42:43 +00:00 committed by David S. Miller
parent be273dc197
commit ddb2e1745d
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
View File

@ -519,13 +519,13 @@ struct qlcnic_host_sds_ring {
int irq; int irq;
dma_addr_t phys_addr; dma_addr_t phys_addr;
char name[IFNAMSIZ+4]; char name[IFNAMSIZ + 12];
} ____cacheline_internodealigned_in_smp; } ____cacheline_internodealigned_in_smp;
struct qlcnic_host_tx_ring { struct qlcnic_host_tx_ring {
int irq; int irq;
void __iomem *crb_intr_mask; void __iomem *crb_intr_mask;
char name[IFNAMSIZ+4]; char name[IFNAMSIZ + 12];
u16 ctx_id; u16 ctx_id;
u32 producer; u32 producer;
u32 sw_consumer; u32 sw_consumer;

23
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View File

@ -1287,7 +1287,7 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
irq_handler_t handler; irq_handler_t handler;
struct qlcnic_host_sds_ring *sds_ring; struct qlcnic_host_sds_ring *sds_ring;
struct qlcnic_host_tx_ring *tx_ring; struct qlcnic_host_tx_ring *tx_ring;
int err, ring; int err, ring, num_sds_rings;
unsigned long flags = 0; unsigned long flags = 0;
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
@ -1318,10 +1318,20 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
if (qlcnic_82xx_check(adapter) || if (qlcnic_82xx_check(adapter) ||
(qlcnic_83xx_check(adapter) && (qlcnic_83xx_check(adapter) &&
(adapter->flags & QLCNIC_MSIX_ENABLED))) { (adapter->flags & QLCNIC_MSIX_ENABLED))) {
for (ring = 0; ring < adapter->max_sds_rings; ring++) { num_sds_rings = adapter->max_sds_rings;
for (ring = 0; ring < num_sds_rings; ring++) {
sds_ring = &recv_ctx->sds_rings[ring]; sds_ring = &recv_ctx->sds_rings[ring];
snprintf(sds_ring->name, sizeof(int) + IFNAMSIZ, if (qlcnic_82xx_check(adapter) &&
"%s[%d]", netdev->name, ring); (ring == (num_sds_rings - 1)))
snprintf(sds_ring->name,
sizeof(sds_ring->name),
"qlcnic-%s[Tx0+Rx%d]",
netdev->name, ring);
else
snprintf(sds_ring->name,
sizeof(sds_ring->name),
"qlcnic-%s[Rx%d]",
netdev->name, ring);
err = request_irq(sds_ring->irq, handler, flags, err = request_irq(sds_ring->irq, handler, flags,
sds_ring->name, sds_ring); sds_ring->name, sds_ring);
if (err) if (err)
@ -1335,9 +1345,8 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
for (ring = 0; ring < adapter->max_drv_tx_rings; for (ring = 0; ring < adapter->max_drv_tx_rings;
ring++) { ring++) {
tx_ring = &adapter->tx_ring[ring]; tx_ring = &adapter->tx_ring[ring];
snprintf(tx_ring->name, sizeof(int) + IFNAMSIZ, snprintf(tx_ring->name, sizeof(tx_ring->name),
"%s[%d]", netdev->name, "qlcnic-%s[Tx%d]", netdev->name, ring);
adapter->max_sds_rings + ring);
err = request_irq(tx_ring->irq, handler, flags, err = request_irq(tx_ring->irq, handler, flags,
tx_ring->name, tx_ring); tx_ring->name, tx_ring);
if (err) if (err)