Browse Source

qmi_wwan: extend permitted QMAP mux_id value range

[ Upstream commit 36815b416fa48766ac5a98e4b2dc3ebc5887222e ]

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

Fixes: c6adf77953bc ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Reinhard Speyerer 6 years ago
parent
commit
2da80536f6
2 changed files with 4 additions and 4 deletions
  1. 2 2
      Documentation/ABI/testing/sysfs-class-net-qmi
  2. 2 2
      drivers/net/usb/qmi_wwan.c

+ 2 - 2
Documentation/ABI/testing/sysfs-class-net-qmi

@@ -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.

+ 2 - 2
drivers/net/usb/qmi_wwan.c

@@ -363,8 +363,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 */
-	if (mux_id < 1 || mux_id > 0x7f)
+	/* mux_id [1 - 254] for compatibility with ip(8) and the rmnet driver */
+	if (mux_id < 1 || mux_id > 254)
 		return -EINVAL;
 		return -EINVAL;
 
 
 	if (!rtnl_trylock())
 	if (!rtnl_trylock())