[PATCH] pch_gbe: Fix the issue which a driver locks when rx offload is set by ethtool
From: Toshiharu Okada <hidden>
Date: 2011-02-08 11:34:47
Also in:
lkml
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
This driver will be in a deadlock, When the rx offload is set by ethtool. So, The pch_gbe_reinit_locked function was modified. Signed-off-by: Toshiharu Okada <redacted> --- drivers/net/pch_gbe/pch_gbe_main.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index 3248313..0e6922f 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c@@ -520,7 +520,9 @@ static void pch_gbe_reset_task(struct work_struct *work) struct pch_gbe_adapter *adapter; adapter = container_of(work, struct pch_gbe_adapter, reset_task); + rtnl_lock(); pch_gbe_reinit_locked(adapter); + rtnl_unlock(); } /**
@@ -531,12 +533,8 @@ void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter) { struct net_device *netdev = adapter->netdev; - rtnl_lock(); - if (netif_running(netdev)) { - pch_gbe_down(adapter); - pch_gbe_up(adapter); - } - rtnl_unlock(); + pch_gbe_down(adapter); + pch_gbe_up(adapter); } /**
--
1.6.2.5