aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 601051c584e8..a80f0cd6b528 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1268,17 +1268,10 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
1268 */ 1268 */
1269irqreturn_t netxen_intr(int irq, void *data) 1269irqreturn_t netxen_intr(int irq, void *data)
1270{ 1270{
1271 struct netxen_adapter *adapter; 1271 struct netxen_adapter *adapter = data;
1272 struct net_device *netdev; 1272 struct net_device *netdev = adapter->netdev;
1273 u32 our_int = 0; 1273 u32 our_int = 0;
1274 1274
1275 if (unlikely(!irq)) {
1276 return IRQ_NONE; /* Not our interrupt */
1277 }
1278
1279 adapter = (struct netxen_adapter *)data;
1280 netdev = adapter->netdev;
1281
1282 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { 1275 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
1283 our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); 1276 our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
1284 /* not our interrupt */ 1277 /* not our interrupt */