* [PATCH net-next 1/2] bnx2: Rename MSI-X vectors.
@ 2008-12-17 2:18 Michael Chan
2008-12-17 2:18 ` [PATCH net-next 2/2] bnx2: Update version to 1.9.0 Michael Chan
2008-12-17 4:27 ` [PATCH net-next 1/2] bnx2: Rename MSI-X vectors David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Michael Chan @ 2008-12-17 2:18 UTC (permalink / raw)
To: davem; +Cc: netdev, Michael Chan, Benjamin Li
Change MSI-X vector names to "ethx-%d".
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
---
drivers/net/bnx2.c | 4 +++-
drivers/net/bnx2.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 0e2218d..6ba2fec 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -5827,6 +5827,8 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
{
int i, rc;
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);
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].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;
}
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 2f43c45..88f962b 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6627,7 +6627,7 @@ struct bnx2_irq {
irq_handler_t handler;
unsigned int vector;
u8 requested;
- char name[16];
+ char name[IFNAMSIZ + 2];
};
struct bnx2_tx_ring_info {
--
1.5.6.GIT
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] bnx2: Update version to 1.9.0.
2008-12-17 2:18 [PATCH net-next 1/2] bnx2: Rename MSI-X vectors Michael Chan
@ 2008-12-17 2:18 ` Michael Chan
2008-12-17 4:28 ` David Miller
2008-12-17 4:27 ` [PATCH net-next 1/2] bnx2: Rename MSI-X vectors David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Michael Chan @ 2008-12-17 2:18 UTC (permalink / raw)
To: davem; +Cc: netdev, Michael Chan
And fix the 5716S pci_device_id entry to point to the proper string.
Signed-off-by: Michael Chan <mchan@broadcom.com>
---
drivers/net/bnx2.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 6ba2fec..1a27803 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -57,8 +57,8 @@
#define DRV_MODULE_NAME "bnx2"
#define PFX DRV_MODULE_NAME ": "
-#define DRV_MODULE_VERSION "1.8.2"
-#define DRV_MODULE_RELDATE "Nov 10, 2008"
+#define DRV_MODULE_VERSION "1.9.0"
+#define DRV_MODULE_RELDATE "Dec 16, 2008"
#define RUN_AT(x) (jiffies + (x))
@@ -131,7 +131,7 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
{ PCI_VENDOR_ID_BROADCOM, 0x163b,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 },
{ PCI_VENDOR_ID_BROADCOM, 0x163c,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 },
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716S },
{ 0, }
};
--
1.5.6.GIT
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/2] bnx2: Rename MSI-X vectors.
2008-12-17 2:18 [PATCH net-next 1/2] bnx2: Rename MSI-X vectors Michael Chan
2008-12-17 2:18 ` [PATCH net-next 2/2] bnx2: Update version to 1.9.0 Michael Chan
@ 2008-12-17 4:27 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2008-12-17 4:27 UTC (permalink / raw)
To: mchan; +Cc: netdev, benli
From: "Michael Chan" <mchan@broadcom.com>
Date: Tue, 16 Dec 2008 18:18:34 -0800
> Change MSI-X vector names to "ethx-%d".
>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
> Signed-off-by: Benjamin Li <benli@broadcom.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 2/2] bnx2: Update version to 1.9.0.
2008-12-17 2:18 ` [PATCH net-next 2/2] bnx2: Update version to 1.9.0 Michael Chan
@ 2008-12-17 4:28 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2008-12-17 4:28 UTC (permalink / raw)
To: mchan; +Cc: netdev
From: "Michael Chan" <mchan@broadcom.com>
Date: Tue, 16 Dec 2008 18:18:35 -0800
> And fix the 5716S pci_device_id entry to point to the proper string.
>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Also applied, thanks Michael.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-12-17 4:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-12-17 2:18 [PATCH net-next 1/2] bnx2: Rename MSI-X vectors Michael Chan
2008-12-17 2:18 ` [PATCH net-next 2/2] bnx2: Update version to 1.9.0 Michael Chan
2008-12-17 4:28 ` David Miller
2008-12-17 4:27 ` [PATCH net-next 1/2] bnx2: Rename MSI-X vectors David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.