Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1466f689 authored by Daniele Palmas's avatar Daniele Palmas Committed by Greg Kroah-Hartman
Browse files

net: usb: qmi_wwan: allow qmimux add/del with master up 



commit 6c59cff38e66584ae3ac6c2f0cbd8d039c710ba7 upstream.

There's no reason for preventing the creation and removal
of qmimux network interfaces when the underlying interface
is up.

This makes qmi_wwan mux implementation more similar to the
rmnet one, simplifying userspace management of the same
logical interfaces.

Fixes: c6adf779 ("net: usb: qmi_wwan: add qmap mux protocol support")
Reported-by: default avatarAleksander Morgado <aleksander@aleksander.es>
Signed-off-by: default avatarDaniele Palmas <dnlplm@gmail.com>
Acked-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7618f5e2

drivers/net/usb/qmi_wwan.c

+0 −14
Original line number Diff line number Diff line
@@ -378,13 +378,6 @@ static ssize_t add_mux_store(struct device *d, struct device_attribute *attr, c 
		goto err;

	}



	/* we don't want to modify a running netdev */

	if (netif_running(dev->net)) {

		netdev_err(dev->net, "Cannot change a running device\n");

		ret = -EBUSY;

		goto err;

	}



	ret = qmimux_register_device(dev->net, mux_id);

	if (!ret) {

		info->flags |= QMI_WWAN_FLAG_MUX;
@@ -414,13 +407,6 @@ static ssize_t del_mux_store(struct device *d, struct device_attribute *attr, c 
	if (!rtnl_trylock())

		return restart_syscall();



	/* we don't want to modify a running netdev */

	if (netif_running(dev->net)) {

		netdev_err(dev->net, "Cannot change a running device\n");

		ret = -EBUSY;

		goto err;

	}



	del_dev = qmimux_find_dev(dev, mux_id);

	if (!del_dev) {

		netdev_err(dev->net, "mux_id not present\n");