leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmi_wwan: extend permitted QMAP mux_id value range

Browse Source 
Permit mux_id values up to 254 to be used in qmimux_register_device()
for compatibility with ip(8) and the rmnet driver.

Fixes: c6adf77953 ("net: usb: qmi_wwan: add qmap mux protocol support")
Cc: Daniele Palmas <dnlplm@gmail.com>
Signed-off-by: Reinhard Speyerer <rspmn@arcor.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Reinhard Speyerer 2019-06-12 19:03:50 +02:00 committed by David S. Miller
parent a8fdde1cb8
commit 36815b416f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/ABI/testing/sysfs-class-net-qmi
View File

@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no>
Description: Description:
Unsigned integer. Unsigned integer.
Write a number ranging from 1 to 127 to add a qmap mux Write a number ranging from 1 to 254 to add a qmap mux
based network device, supported by recent Qualcomm based based network device, supported by recent Qualcomm based
modems. modems.
@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no>
Description: Description:
Unsigned integer. Unsigned integer.
Write a number ranging from 1 to 127 to delete a previously Write a number ranging from 1 to 254 to delete a previously
created qmap mux based network device. created qmap mux based network device.

4
drivers/net/usb/qmi_wwan.c
View File

@ -429,8 +429,8 @@ static ssize_t add_mux_store(struct device *d, struct device_attribute *attr, c
if (kstrtou8(buf, 0, &mux_id)) if (kstrtou8(buf, 0, &mux_id))
return -EINVAL; return -EINVAL;
/* mux_id [1 - 0x7f] range empirically found */ /* mux_id [1 - 254] for compatibility with ip(8) and the rmnet driver */
if (mux_id < 1 || mux_id > 0x7f) if (mux_id < 1 || mux_id > 254)
return -EINVAL; return -EINVAL;
if (!rtnl_trylock()) if (!rtnl_trylock())