Skip to content

Commit

Permalink
ixgbe: fix bug with napi add before request_irq
Browse files Browse the repository at this point in the history
Occasionally if the driver was loaded in a system that
didn't support MSI-X or MSI and was on a shared interrupt,
the driver would then panic in NAPI on the first shared
interrupt because we hadn't called napi_add yet.

Solution: call napi_add before calling request_irq

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jesse Brandeburg authored and David S. Miller committed Mar 14, 2009
1 parent 509ee93 commit 4dd64df
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2339,8 +2339,6 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
else
ixgbe_configure_msi_and_legacy(adapter);

ixgbe_napi_add_all(adapter);

clear_bit(__IXGBE_DOWN, &adapter->state);
ixgbe_napi_enable_all(adapter);

Expand Down Expand Up @@ -2397,6 +2395,8 @@ int ixgbe_up(struct ixgbe_adapter *adapter)
/* hardware has been reset, we need to reload some things */
ixgbe_configure(adapter);

ixgbe_napi_add_all(adapter);

return ixgbe_up_complete(adapter);
}

Expand Down Expand Up @@ -3426,6 +3426,8 @@ static int ixgbe_open(struct net_device *netdev)

ixgbe_configure(adapter);

ixgbe_napi_add_all(adapter);

err = ixgbe_request_irq(adapter);
if (err)
goto err_req_irq;
Expand Down Expand Up @@ -3480,6 +3482,7 @@ static int ixgbe_close(struct net_device *netdev)
/**
* ixgbe_napi_add_all - prep napi structs for use
* @adapter: private struct
*
* helper function to napi_add each possible q_vector->napi
*/
void ixgbe_napi_add_all(struct ixgbe_adapter *adapter)
Expand Down Expand Up @@ -3552,7 +3555,6 @@ static int ixgbe_resume(struct pci_dev *pdev)
return err;
}

ixgbe_napi_add_all(adapter);
ixgbe_reset(adapter);

if (netif_running(netdev)) {
Expand Down

0 comments on commit 4dd64df

Please sign in to comment.