Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/cdc_ncm-fix-the-build-warning.patch b/queue-5.4/cdc_ncm-fix-the-build-warning.patch
new file mode 100644 (file)
index 0000000..a47db97
--- /dev/null
+++ b/queue-5.4/cdc_ncm-fix-the-build-warning.patch
@@ -0,0 +1,35 @@
+From e361d55cf08f525560c2835bcc16dbdd938ad155 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 14 Mar 2020 10:33:24 +0500
+Subject: cdc_ncm: Fix the build warning
+
+From: Alexander Bersenev <bay@hackerdom.ru>
+
+[ Upstream commit 5d0ab06b63fc9c727a7bb72c81321c0114be540b ]
+
+The ndp32->wLength is two bytes long, so replace cpu_to_le32 with cpu_to_le16.
+
+Fixes: 0fa81b304a79 ("cdc_ncm: Implement the 32-bit version of NCM Transfer Block")
+Signed-off-by: Alexander Bersenev <bay@hackerdom.ru>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/usb/cdc_ncm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
+index 5fb4f74c26efd..4824385fe2c79 100644
+--- a/drivers/net/usb/cdc_ncm.c
++++ b/drivers/net/usb/cdc_ncm.c
+@@ -1177,7 +1177,7 @@ static struct usb_cdc_ncm_ndp32 *cdc_ncm_ndp32(struct cdc_ncm_ctx *ctx, struct s
+               ndp32 = ctx->delayed_ndp32;
+ 
+       ndp32->dwSignature = sign;
+-      ndp32->wLength = cpu_to_le32(sizeof(struct usb_cdc_ncm_ndp32) + sizeof(struct usb_cdc_ncm_dpe32));
++      ndp32->wLength = cpu_to_le16(sizeof(struct usb_cdc_ncm_ndp32) + sizeof(struct usb_cdc_ncm_dpe32));
+       return ndp32;
+ }
+ 
+-- 
+2.39.2
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 0f5a742377ad1796db69036e04fa59b8c89d7d43..0f4a7b4f11361c83cc23942242116dc822de2e37 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -6,3 +6,4 @@ power-supply-bq24190-call-power_supply_changed-after.patch
 fs-fix-undefined-behavior-in-bit-shift-for-sb_nouser.patch
 net-mlx5-devcom-only-supports-2-ports.patch
 net-mlx5-devcom-serialize-devcom-registration.patch
+cdc_ncm-fix-the-build-warning.patch