aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pch_gbe/pch_gbe_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pch_gbe/pch_gbe_main.c')
-rw-r--r--drivers/net/pch_gbe/pch_gbe_main.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index 1bf12339441b..4c9a7d4f3fca 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -519,7 +519,9 @@ static void pch_gbe_reset_task(struct work_struct *work)
519 struct pch_gbe_adapter *adapter; 519 struct pch_gbe_adapter *adapter;
520 adapter = container_of(work, struct pch_gbe_adapter, reset_task); 520 adapter = container_of(work, struct pch_gbe_adapter, reset_task);
521 521
522 rtnl_lock();
522 pch_gbe_reinit_locked(adapter); 523 pch_gbe_reinit_locked(adapter);
524 rtnl_unlock();
523} 525}
524 526
525/** 527/**
@@ -528,14 +530,8 @@ static void pch_gbe_reset_task(struct work_struct *work)
528 */ 530 */
529void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter) 531void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter)
530{ 532{
531 struct net_device *netdev = adapter->netdev; 533 pch_gbe_down(adapter);
532 534 pch_gbe_up(adapter);
533 rtnl_lock();
534 if (netif_running(netdev)) {
535 pch_gbe_down(adapter);
536 pch_gbe_up(adapter);
537 }
538 rtnl_unlock();
539} 535}
540 536
541/** 537/**