Commit a0fcefb7 authored by Ross Lagerwall's avatar Ross Lagerwall Committed by Greg Kroah-Hartman

xen-netfront: Update features after registering netdev

[ Upstream commit 45c8184c ]

Update the features after calling register_netdev() otherwise the
device features are not set up correctly and it not possible to change
the MTU of the device. After this change, the features reported by
ethtool match the device's features before the commit which introduced
the issue and it is possible to change the device's MTU.

Fixes: f599c64f ("xen-netfront: Fix race between device setup and open")
Reported-by: default avatarLiam Shepherd <liam@dancer.es>
Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9de25566
...@@ -1964,10 +1964,6 @@ static int xennet_connect(struct net_device *dev) ...@@ -1964,10 +1964,6 @@ static int xennet_connect(struct net_device *dev)
/* talk_to_netback() sets the correct number of queues */ /* talk_to_netback() sets the correct number of queues */
num_queues = dev->real_num_tx_queues; num_queues = dev->real_num_tx_queues;
rtnl_lock();
netdev_update_features(dev);
rtnl_unlock();
if (dev->reg_state == NETREG_UNINITIALIZED) { if (dev->reg_state == NETREG_UNINITIALIZED) {
err = register_netdev(dev); err = register_netdev(dev);
if (err) { if (err) {
...@@ -1977,6 +1973,10 @@ static int xennet_connect(struct net_device *dev) ...@@ -1977,6 +1973,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 * All public and private state should now be sane. Get
* ready to start sending and receiving packets and give the driver * ready to start sending and receiving packets and give the driver
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment