From 730096d67111b18f73b6d0cd392d8acbeedc706b Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Tue, 24 May 2011 21:56:02 +0000
Subject: [PATCH] --- yaml --- r: 251654 b: refs/heads/master c:
 1ba37c518f8f83094209396c65a72732b2c1df3b h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/xen-netfront.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 860ab91b0efb..4d59292a8d9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b4472cc13136d04727e399c6fdadf58d2218b0a
+refs/heads/master: 1ba37c518f8f83094209396c65a72732b2c1df3b
diff --git a/trunk/drivers/net/xen-netfront.c b/trunk/drivers/net/xen-netfront.c
index db9a763aaa7f..d29365a232a1 100644
--- a/trunk/drivers/net/xen-netfront.c
+++ b/trunk/drivers/net/xen-netfront.c
@@ -1581,7 +1581,9 @@ static int xennet_connect(struct net_device *dev)
 	if (err)
 		return err;
 
+	rtnl_lock();
 	netdev_update_features(dev);
+	rtnl_unlock();
 
 	spin_lock_bh(&np->rx_lock);
 	spin_lock_irq(&np->tx_lock);