From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 6 May 2008 18:36:26 +0000 (+0100)
Subject: qla3xxx: Hold RTNL while calling dev_close()
X-Git-Tag: v2.6.26-rc9~84^2~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c81ec80bc86f4eacd5f48229c1de623865acbb92;p=linux-2.6-omap-h63xx.git

qla3xxx: Hold RTNL while calling dev_close()

dev_close() must be called holding the RTNL.  Compile-tested only.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index b7f7b2227d5..bccee68bd48 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -3701,7 +3701,9 @@ static int ql_cycle_adapter(struct ql3_adapter *qdev, int reset)
 		printk(KERN_ERR PFX
 				"%s: Driver up/down cycle failed, "
 				"closing device\n",qdev->ndev->name);
+		rtnl_lock();
 		dev_close(qdev->ndev);
+		rtnl_unlock();
 		return -1;
 	}
 	return 0;