Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-19 15:12:17 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-19 15:12:40 +0200
commit50161e71cc5afe7454c7da840a0962b6b61707ac (patch)
tree21baf96f77326db596cb302be8f178f7e5d300c4
parent6b4f9aab7165ae2480adf18e14fd0d5249a9bc6d (diff)
qmi_wwan: extend permitted QMAP mux_id value range
(bsc#1051510).
-rw-r--r--patches.drivers/qmi_wwan-extend-permitted-QMAP-mux_id-value-range.patch60
-rw-r--r--series.conf1
2 files changed, 61 insertions, 0 deletions
diff --git a/patches.drivers/qmi_wwan-extend-permitted-QMAP-mux_id-value-range.patch b/patches.drivers/qmi_wwan-extend-permitted-QMAP-mux_id-value-range.patch
new file mode 100644
index 0000000000..fb1b7ef206
--- /dev/null
+++ b/patches.drivers/qmi_wwan-extend-permitted-QMAP-mux_id-value-range.patch
@@ -0,0 +1,60 @@
+From 36815b416fa48766ac5a98e4b2dc3ebc5887222e Mon Sep 17 00:00:00 2001
+From: Reinhard Speyerer <rspmn@arcor.de>
+Date: Wed, 12 Jun 2019 19:03:50 +0200
+Subject: [PATCH] qmi_wwan: extend permitted QMAP mux_id value range
+Git-commit: 36815b416fa48766ac5a98e4b2dc3ebc5887222e
+Patch-mainline: v5.2-rc6
+References: bsc#1051510
+
+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>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ Documentation/ABI/testing/sysfs-class-net-qmi | 4 ++--
+ drivers/net/usb/qmi_wwan.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Documentation/ABI/testing/sysfs-class-net-qmi b/Documentation/ABI/testing/sysfs-class-net-qmi
+index 7122d6264c49..c310db4ccbc2 100644
+--- a/Documentation/ABI/testing/sysfs-class-net-qmi
++++ b/Documentation/ABI/testing/sysfs-class-net-qmi
+@@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no>
+ Description:
+ 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
+ modems.
+
+@@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no>
+ Description:
+ 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.
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
+index c6fbc2a2a785..780c10ee359b 100644
+--- a/drivers/net/usb/qmi_wwan.c
++++ b/drivers/net/usb/qmi_wwan.c
+@@ -429,8 +429,8 @@ static ssize_t add_mux_store(struct device *d, struct device_attribute *attr, c
+ if (kstrtou8(buf, 0, &mux_id))
+ 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;
+
+ if (!rtnl_trylock())
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 3885bde217..9957d28546 100644
--- a/series.conf
+++ b/series.conf
@@ -22582,6 +22582,7 @@
patches.drivers/qmi_wwan-add-support-for-QMAP-padding-in-the-RX-path.patch
patches.drivers/qmi_wwan-add-network-device-usage-statistics-for-qmi.patch
patches.drivers/qmi_wwan-avoid-RCU-stalls-on-device-disconnect-when-.patch
+ patches.drivers/qmi_wwan-extend-permitted-QMAP-mux_id-value-range.patch
patches.fixes/tcp-limit-payload-size-of-sacked-skbs.patch
patches.fixes/tcp-tcp_fragment-should-apply-sane-memory-limits.patch
patches.fixes/tcp-add-tcp_min_snd_mss-sysctl.patch