|
@@ -246,6 +246,8 @@ static const struct flash_spec flash_5709 = {
|
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);
|
|
MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);
|
|
|
|
|
|
|
|
+static void bnx2_init_napi(struct bnx2 *bp);
|
|
|
|
+
|
|
static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr)
|
|
static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr)
|
|
{
|
|
{
|
|
u32 diff;
|
|
u32 diff;
|
|
@@ -6197,6 +6199,7 @@ bnx2_open(struct net_device *dev)
|
|
bnx2_disable_int(bp);
|
|
bnx2_disable_int(bp);
|
|
|
|
|
|
bnx2_setup_int_mode(bp, disable_msi);
|
|
bnx2_setup_int_mode(bp, disable_msi);
|
|
|
|
+ bnx2_init_napi(bp);
|
|
bnx2_napi_enable(bp);
|
|
bnx2_napi_enable(bp);
|
|
rc = bnx2_alloc_mem(bp);
|
|
rc = bnx2_alloc_mem(bp);
|
|
if (rc)
|
|
if (rc)
|
|
@@ -8207,7 +8210,7 @@ bnx2_init_napi(struct bnx2 *bp)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
|
|
|
|
|
|
+ for (i = 0; i < bp->irq_nvecs; i++) {
|
|
struct bnx2_napi *bnapi = &bp->bnx2_napi[i];
|
|
struct bnx2_napi *bnapi = &bp->bnx2_napi[i];
|
|
int (*poll)(struct napi_struct *, int);
|
|
int (*poll)(struct napi_struct *, int);
|
|
|
|
|
|
@@ -8276,7 +8279,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
dev->ethtool_ops = &bnx2_ethtool_ops;
|
|
dev->ethtool_ops = &bnx2_ethtool_ops;
|
|
|
|
|
|
bp = netdev_priv(dev);
|
|
bp = netdev_priv(dev);
|
|
- bnx2_init_napi(bp);
|
|
|
|
|
|
|
|
pci_set_drvdata(pdev, dev);
|
|
pci_set_drvdata(pdev, dev);
|
|
|
|
|