|
@@ -247,13 +247,14 @@ out_free_newdev:
|
|
|
return err;
|
|
return err;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static void qmimux_unregister_device(struct net_device *dev)
|
|
|
|
|
|
|
+static void qmimux_unregister_device(struct net_device *dev,
|
|
|
|
|
+ struct list_head *head)
|
|
|
{
|
|
{
|
|
|
struct qmimux_priv *priv = netdev_priv(dev);
|
|
struct qmimux_priv *priv = netdev_priv(dev);
|
|
|
struct net_device *real_dev = priv->real_dev;
|
|
struct net_device *real_dev = priv->real_dev;
|
|
|
|
|
|
|
|
netdev_upper_dev_unlink(real_dev, dev);
|
|
netdev_upper_dev_unlink(real_dev, dev);
|
|
|
- unregister_netdevice(dev);
|
|
|
|
|
|
|
+ unregister_netdevice_queue(dev, head);
|
|
|
|
|
|
|
|
/* Get rid of the reference to real_dev */
|
|
/* Get rid of the reference to real_dev */
|
|
|
dev_put(real_dev);
|
|
dev_put(real_dev);
|
|
@@ -424,7 +425,7 @@ static ssize_t del_mux_store(struct device *d, struct device_attribute *attr, c
|
|
|
ret = -EINVAL;
|
|
ret = -EINVAL;
|
|
|
goto err;
|
|
goto err;
|
|
|
}
|
|
}
|
|
|
- qmimux_unregister_device(del_dev);
|
|
|
|
|
|
|
+ qmimux_unregister_device(del_dev, NULL);
|
|
|
|
|
|
|
|
if (!qmimux_has_slaves(dev))
|
|
if (!qmimux_has_slaves(dev))
|
|
|
info->flags &= ~QMI_WWAN_FLAG_MUX;
|
|
info->flags &= ~QMI_WWAN_FLAG_MUX;
|
|
@@ -1434,6 +1435,7 @@ static void qmi_wwan_disconnect(struct usb_interface *intf)
|
|
|
struct qmi_wwan_state *info;
|
|
struct qmi_wwan_state *info;
|
|
|
struct list_head *iter;
|
|
struct list_head *iter;
|
|
|
struct net_device *ldev;
|
|
struct net_device *ldev;
|
|
|
|
|
+ LIST_HEAD(list);
|
|
|
|
|
|
|
|
/* called twice if separate control and data intf */
|
|
/* called twice if separate control and data intf */
|
|
|
if (!dev)
|
|
if (!dev)
|
|
@@ -1446,8 +1448,9 @@ static void qmi_wwan_disconnect(struct usb_interface *intf)
|
|
|
}
|
|
}
|
|
|
rcu_read_lock();
|
|
rcu_read_lock();
|
|
|
netdev_for_each_upper_dev_rcu(dev->net, ldev, iter)
|
|
netdev_for_each_upper_dev_rcu(dev->net, ldev, iter)
|
|
|
- qmimux_unregister_device(ldev);
|
|
|
|
|
|
|
+ qmimux_unregister_device(ldev, &list);
|
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|
|
|
|
|
+ unregister_netdevice_many(&list);
|
|
|
rtnl_unlock();
|
|
rtnl_unlock();
|
|
|
info->flags &= ~QMI_WWAN_FLAG_MUX;
|
|
info->flags &= ~QMI_WWAN_FLAG_MUX;
|
|
|
}
|
|
}
|