1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 922ce0abf5cf..a57daecf1d57 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1810,7 +1810,7 @@ static int talk_to_netback(struct xenbus_device *dev,
         err = xen_net_read_mac(dev, info->netdev->dev_addr);
         if (err) {
                 xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
-                goto out;
+                goto out_unlocked;
         }
 
         rtnl_lock();
@@ -1925,6 +1925,7 @@ abort_transaction_no_dev_fatal:
         xennet_destroy_queues(info);
  out:
         rtnl_unlock();
+out_unlocked:
         device_unregister(&dev->dev);
         return err;
 }
@@ -1950,10 +1951,6 @@ static int xennet_connect(struct net_device *dev)
         /* talk_to_netback() sets the correct number of queues */
         num_queues = dev->real_num_tx_queues;
 
-        rtnl_lock();
-        netdev_update_features(dev);
-        rtnl_unlock();
-
         if (dev->reg_state == NETREG_UNINITIALIZED) {
                 err = register_netdev(dev);
                 if (err) {
@@ -1963,6 +1960,10 @@ static int xennet_connect(struct net_device *dev)
                 }
         }
 
+        rtnl_lock();
+        netdev_update_features(dev);
+        rtnl_unlock();
+
         /*
          * All public and private state should now be sane.  Get
          * ready to start sending and receiving packets and give the driver