git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: Fix key cache slot selection for splitmic
[safe/jmp/linux-2.6]
/
drivers
/
net
/
bnx2.c
diff --git
a/drivers/net/bnx2.c
b/drivers/net/bnx2.c
index
0e2218d
..
1a27803
100644
(file)
--- 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_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))
#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_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, BCM5716
S
},
{ 0, }
};
{ 0, }
};
@@
-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];
{
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);
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;
msix_ent[i].entry = i;
msix_ent[i].vector = 0;
- s
trcpy(bp->irq_tbl[i].name, bp->dev->name
);
+ s
nprintf(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;
}