mirror of
https://github.com/rancher/os-kernel.git
synced 2025-09-18 07:50:43 +00:00
Remove xen-netfron patches as 4.14.79 has included them
https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.14.79
This commit is contained in:
@@ -1,21 +0,0 @@
|
||||
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
|
||||
index d5e790dd589a..d7dc95f58dae 100644
|
||||
--- a/drivers/net/xen-netfront.c
|
||||
+++ b/drivers/net/xen-netfront.c
|
||||
@@ -1817,7 +1817,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();
|
||||
@@ -1932,6 +1932,7 @@ static int talk_to_netback(struct xenbus_device *dev,
|
||||
xennet_destroy_queues(info);
|
||||
out:
|
||||
rtnl_unlock();
|
||||
+out_unlocked:
|
||||
device_unregister(&dev->dev);
|
||||
return err;
|
||||
}
|
@@ -1,26 +0,0 @@
|
||||
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
|
||||
index d7dc95f58dae..31bc4210f969 100644
|
||||
--- a/drivers/net/xen-netfront.c
|
||||
+++ b/drivers/net/xen-netfront.c
|
||||
@@ -1958,10 +1958,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) {
|
||||
@@ -1971,6 +1967,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
|
Reference in New Issue
Block a user