From 68818cda49fcb2a88cd7c14a7daaff0c029dc209 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 31 May 2023 13:11:10 -0400 Subject: [PATCH] Fixes for 4.19 Signed-off-by: Sasha Levin --- .../cdc_ncm-fix-the-build-warning.patch | 35 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 queue-4.19/cdc_ncm-fix-the-build-warning.patch diff --git a/queue-4.19/cdc_ncm-fix-the-build-warning.patch b/queue-4.19/cdc_ncm-fix-the-build-warning.patch new file mode 100644 index 00000000000..864cc8c86d7 --- /dev/null +++ b/queue-4.19/cdc_ncm-fix-the-build-warning.patch @@ -0,0 +1,35 @@ +From 9bcc6e0ec51ea9a3ce5b4e7fcf564e447f926e17 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 14 Mar 2020 10:33:24 +0500 +Subject: cdc_ncm: Fix the build warning + +From: Alexander Bersenev + +[ 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 +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + 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 e89a1a4333d55..65dac36d8d4ff 100644 +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -1178,7 +1178,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-4.19/series b/queue-4.19/series index 9e6641f4fa5..79465acf412 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -3,3 +3,4 @@ net-cdc_ncm-deal-with-too-low-values-of-dwntboutmaxs.patch power-supply-bq27xxx-after-charger-plug-in-out-wait-.patch power-supply-core-refactor-power_supply_set_input_cu.patch power-supply-bq24190-call-power_supply_changed-after.patch +cdc_ncm-fix-the-build-warning.patch -- 2.47.3