diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-22 07:54:54 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-22 07:54:54 +0900 |
| commit | 962c661f14ad08d524f4870eeaa2d0856b830840 (patch) | |
| tree | 3f7035bbec6bcef69441ea6f93c4fcaf15c6f38c | |
| parent | 44a5cd436ec067c9a62988aca3331ac6eee5268d (diff) | |
| parent | 45c8184c1bed1ca8a7f02918552063a00b909bf5 (diff) | |
| download | linux-962c661f14ad08d524f4870eeaa2d0856b830840.tar.gz linux-962c661f14ad08d524f4870eeaa2d0856b830840.tar.bz2 linux-962c661f14ad08d524f4870eeaa2d0856b830840.zip | |
Merge branch 'xen-netfront-fixes'
Ross Lagerwall says:
====================
xen-netfront: Fix issues with commit f599c64fdf7d
Fix a couple of issues with commit f599c64fdf7d ("xen-netfront: Fix race
between device setup and open").
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/xen-netfront.c | 11 |
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 |