From 7338902953b0735161b7602d02478779f0e4f4c0 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Mon, 10 May 2010 15:00:10 +0000 Subject: [PATCH] --- yaml --- r: 195049 b: refs/heads/master c: 52a9b2319628e2cbbff7abc4f1092f4597c75a4f h: refs/heads/master i: 195047: bf014c2a97d2c85a28adaa95c3917617dc7dd079 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a00ca3accd13..569790705602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd791618c28f524598bcfa941d948b1126a2394a +refs/heads/master: 52a9b2319628e2cbbff7abc4f1092f4597c75a4f diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 36473e6d07d6..16a03c553299 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -3220,7 +3220,11 @@ int e1000e_up(struct e1000_adapter *adapter) netif_wake_queue(adapter->netdev); /* fire a link change interrupt to start the watchdog */ - ew32(ICS, E1000_ICS_LSC); + if (adapter->msix_entries) + ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER); + else + ew32(ICS, E1000_ICS_LSC); + return 0; } @@ -3537,7 +3541,10 @@ static int e1000_open(struct net_device *netdev) pm_runtime_put(&pdev->dev); /* fire a link status change interrupt to start the watchdog */ - ew32(ICS, E1000_ICS_LSC); + if (adapter->msix_entries) + ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER); + else + ew32(ICS, E1000_ICS_LSC); return 0;