From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90F50C433EF for ; Thu, 14 Apr 2022 08:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241009AbiDNIlj (ORCPT ); Thu, 14 Apr 2022 04:41:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240982AbiDNIle (ORCPT ); Thu, 14 Apr 2022 04:41:34 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52ECB64BDB for ; Thu, 14 Apr 2022 01:39:10 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id s18so8762388ejr.0 for ; Thu, 14 Apr 2022 01:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WFWSbvyg+22b/MTXpAJu7hFpGo/4sj3aFOsTXUdx0xU=; b=ZLXMAdvZA5nPgsMZXpuI68jXLnxG3WeCvhyC2GDAFZqh8PUfxRByOo0E+6+BwchGz3 HTTKg17xUiBhRy2Iholc/Q5lS9y50YhJNeLFwNlbThEUvFcPwdV4kUuBI0CmHDUK0Bj8 +mkh8MPxDBGs3giiND6xjptxk3Zq8m+fRt4texdNoDHTGorpNztfSl62is27kC9QwWyz +AuaNtBJ6fJhIjmTeTuC9QW+NQkq9c86lD7N9eSiUglPxC/AO9YFlPSg2E617BkWrwz8 p4x9OYw7oO3d79QD0yQsM8QmwPEuWS9kyHk4EJQLPevorLOAIyAs7I/ikEbo0X0FdI1V TQ9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WFWSbvyg+22b/MTXpAJu7hFpGo/4sj3aFOsTXUdx0xU=; b=EudGxRlub161WhKmCTcp+3zgFIStC+G8Mvt/0oT4jOF9+Eaemqb1iX3wywgUjbCf35 64FafMRFBm2TzvJeSraYZyC6/1gzj8OJipPuvtR6ZtjkrW00Um5tiEWX8QLZ7lXlzYyJ jywFKRLowSfHsk/u9hrwn7Q9Gk5jh2JZV/TYw6eqGZRbEdXGx7N9V38qqtavDV3jZzSk GWA9IeYGpi9yDSJcGKGm1mmu7L1i97yXWwBVFckQhVkt3AR+z5yRfxOm+T3OTot2m49N 42ZKsajrksgdhMeX4Yaxk3N7QqTnfV5ioXlQgKjERJL1kXZgJ/Jh6t31kICWoRt6nwzQ JIYw== X-Gm-Message-State: AOAM533N4vd7JP76V61lGqb15bW0aP/4Oi2lQzYOS+J6c2h2+1lnDoIh qceBoTqj0goHAWnQlL9jih0= X-Google-Smtp-Source: ABdhPJwMzD9CCiNoIR7HLLoeUlQ/lfMg5II32J07JGisVsIreiCSfjHc5/sYQN5rHAeaU7oFV2w0KQ== X-Received: by 2002:a17:907:d16:b0:6d6:e3b6:9cd8 with SMTP id gn22-20020a1709070d1600b006d6e3b69cd8mr1380050ejc.94.1649925548940; Thu, 14 Apr 2022 01:39:08 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:08 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/7] staging: r8188eu: fix struct rt_firmware_hdr Date: Thu, 14 Apr 2022 10:38:47 +0200 Message-Id: <20220414083853.3422-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The structure rt_firmware_hdr is wrong, there are two issues. The first issue is that the size of struct rt_firmware_hdr is 33 bytes but the header in the firmware file is 32 bytes long. The hexdump of rtl8188eufw.bin shows that the field Rsvd1 of struct rt_firmware_hdr should be u8 instead of __le16. OFFSET rtl8188eufw.bin Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 ----------------------------------------------------------- 0x00000000 E1 88 10 00 0B 00 01 00 01 21 11 27 30 36 00 00 0x00000010 2D 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x00000020 02 45 4E 00 00 00 00 00 00 00 00 00 00 00 00 00 0x00000000 E1 88 10 00 0B 00 01 00 01 21 11 27 30 36 00 00 ^ ^ ^ ^ ^ ^ Subversion Rsvd1 Month Date Hour Minute This was figured out by looking at struct rtlwifi_firmware_header in drivers/net/wireless/rtlwifi/wifi.h and the firmware file that the rtlwifi/rtl8188ee driver uses. The second issue is that the u16 and u32 fields sould be __le16 and __le32. Change the field Rsvd1 to u8 and the u16, u32 fileds to __le16, __le32. Both issues had no effect because the header size is actually hardcoded to 32 where it is used in the code. Also the fields after Subversion are not used and the bytes of the u16 and u32 fields are all zero. Fixes: 7884fc0a1473 ("staging: r8188eu: introduce new include dir for RTL81= 88eu driver") Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 8620f3c92b52..7cd08268f3b9 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -29,7 +29,7 @@ struct rt_firmware_hdr { * FW for different conditions */ __le16 Version; /* FW Version */ u8 Subversion; /* FW Subversion, default 0x00 */ - u16 Rsvd1; + u8 Rsvd1; =20 /* LONG WORD 1 ---- */ u8 Month; /* Release time Month field */ @@ -42,11 +42,11 @@ struct rt_firmware_hdr { =20 /* LONG WORD 2 ---- */ __le32 SvnIdx; /* The SVN entry index */ - u32 Rsvd3; + __le32 Rsvd3; =20 /* LONG WORD 3 ---- */ - u32 Rsvd4; - u32 Rsvd5; + __le32 Rsvd4; + __le32 Rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) --=20 2.35.1 From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46464C433FE for ; Thu, 14 Apr 2022 08:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241015AbiDNIlo (ORCPT ); Thu, 14 Apr 2022 04:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240976AbiDNIlf (ORCPT ); Thu, 14 Apr 2022 04:41:35 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56AD764706 for ; Thu, 14 Apr 2022 01:39:11 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id u15so8619875ejf.11 for ; Thu, 14 Apr 2022 01:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SjWebb0xz2JlPboqiHF18jFOy9xu4u7Sl1Xjhzt8LEw=; b=gP4/hSeWQuS/g+Q7CqB/kF5+oipUEMvVVqp8MLHg1J9F9iKPwR2vS6Xda2MWovTVA9 nyov1stL3UHsRhvCGJTTh3/1zAqQtHMd45Z3pRLHR2jTEDqXX1WQKr94+bbrKLmVAdO2 DmTDZl/TMIdWNd0MumK5IAZHB2ArAQZmwDwxhfDVPzzWpFggSD9ky7fDcTpueHeY3B5A b+lYtLDS1XXLEVON8pAPL+7XS5ZtJimTD0wMKJL+fNUNwPA9F2ZK/rIy4S1kA6vbA5OE 6dpGBZ3Kzbx8vitV669+USDbw9W1CNMbw5gm4rjAr2VhNX9tfhRRxt+hpdRzVjFogH+m djoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SjWebb0xz2JlPboqiHF18jFOy9xu4u7Sl1Xjhzt8LEw=; b=23XzxtlGpOTjLNngwz/ATSsFjBVKdf3gEhLKbSYOxKYEBLrPx1pC2bKTwg14JJQwjY nlVG2KVQx5iJxJ7ZKmUZxMMoKxB2T9wIVVFNL/usjCZyvpkt1yVQweSt2lHSOzF5Rxu5 1AiTdmLXI46Z9gi+SQ2j3Oc4XMkezRrAr3fyvcwy/OgaDTQpUNDvGxHeW2gq/g/firlF 0nVd6dRZr8YK6iRaia36aZPSWIG0lne2GNhZ9j8ut7aW+DtcekRgLp1Yc1XaX/j9wfoE ZPwnYDyuv+2G9naIUbuVEBFxvhkofzap/Uh2yT+l8uG8JJXMy+UKEDJhZXivxEP8Izh0 GD7A== X-Gm-Message-State: AOAM530+h678e0SF7Rc0qQ+WdJpjQDJThA8lDn6E67TJud0mP9ZbJgxr QAuPL0lzJmykt7hlVGdzYns= X-Google-Smtp-Source: ABdhPJxAErEv6I5kwWbRoynQtPMycoHXJfZsxujVKDmp2ouG2mnaosUahQhIU+lmF+W/N036r7s/GQ== X-Received: by 2002:a17:907:9702:b0:6e8:be82:f43d with SMTP id jg2-20020a170907970200b006e8be82f43dmr1388679ejc.67.1649925549935; Thu, 14 Apr 2022 01:39:09 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:09 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/7] staging: r8188eu: clean up comments in struct rt_firmware_hdr Date: Thu, 14 Apr 2022 10:38:48 +0200 Message-Id: <20220414083853.3422-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The comments in struct rt_firmware_hdr are not needed. Remove them. Signed-off-by: Michael Straube Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 --- drivers/staging/r8188eu/core/rtw_fw.c | 37 ++++++++------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7cd08268f3b9..323e0c634c4e 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -14,37 +14,22 @@ (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) =20 -/* This structure must be careful with byte-ordering */ - struct rt_firmware_hdr { - /* 8-byte alinment required */ - /* LONG WORD 0 ---- */ - __le16 Signature; /* 92C0: test chip; 92C, - * 88C0: test chip; 88C1: MP A-cut; - * 92C1: MP A-cut */ - u8 Category; /* AP/NIC and USB/PCI */ - u8 Function; /* Reserved for different FW function - * indcation, for further use when - * driver needs to download different - * FW for different conditions */ - __le16 Version; /* FW Version */ - u8 Subversion; /* FW Subversion, default 0x00 */ + __le16 Signature; + u8 Category; + u8 Function; + __le16 Version; + u8 Subversion; u8 Rsvd1; - - /* LONG WORD 1 ---- */ - u8 Month; /* Release time Month field */ - u8 Date; /* Release time Date field */ - u8 Hour; /* Release time Hour field */ - u8 Minute; /* Release time Minute field */ - __le16 RamCodeSize; /* The size of RAM code */ + u8 Month; + u8 Date; + u8 Hour; + u8 Minute; + __le16 RamCodeSize; u8 Foundry; u8 Rsvd2; - - /* LONG WORD 2 ---- */ - __le32 SvnIdx; /* The SVN entry index */ + __le32 SvnIdx; __le32 Rsvd3; - - /* LONG WORD 3 ---- */ __le32 Rsvd4; __le32 Rsvd5; }; --=20 2.35.1 From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91151C433F5 for ; Thu, 14 Apr 2022 08:39:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241026AbiDNIlv (ORCPT ); Thu, 14 Apr 2022 04:41:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240991AbiDNIlg (ORCPT ); Thu, 14 Apr 2022 04:41:36 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DA7764BDE for ; Thu, 14 Apr 2022 01:39:12 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id lc2so8617380ejb.12 for ; Thu, 14 Apr 2022 01:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SVFAJRqd3IbNMgTMyXPpJtbL2G7uewgHBXHJSIvHW0o=; b=VE8YjlWUKgkchXEYuJVz5rbZ07MGhtaOwGwA7HmAK6bA4qU3xj3YGDjn5/smmYiB8k Ww6zgK7ju9y67TXHRHkeP4WmDgrVXT6+wOGLMkxecOTp67SPIRE912TGf+houWsc5UUs WSLE4Imqjecg+cA/1ijEc4pcjlnZ6kTeRtBRbb0Oi3NxQntbt4y8CkQysj5KfGq+9C6K u5IHgpOIO+rheL/+MLVVbLJtxcrpoCUS+18MPYbJ4tuQzCqfty/3sJqC1G8BNBeLYTVr kJf6tAgwYi6gmr2ZU1R5bRbYfPsdQ0RwCMhdIyn8vUlzNqyhv6x/0v0o0upbB/dJtUd0 0nEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SVFAJRqd3IbNMgTMyXPpJtbL2G7uewgHBXHJSIvHW0o=; b=KA2mLMq8p5mXIAejzYy2kB1sqKiH/PFnjACuX/YhlZe9N2k3tqM3PpCY9d+RfXxZgq owCuHkAoKAtnIkcWWQl2S/Lm8lvana2jnwRiLalnPALHIfqLYWxQXx/bw7g10yh8U+3z synY90Ci48MSe4SPlgK0WxtTbG31GI5xx0H7CG0Krsr/Yo0rbK08We80e2PlOtfcElm2 NJCwUOag8V4IwkM+gYr3YH3HDwi2MRf0nVls+vTpintYX9Z2quf6bO5ih11FWq0d5BZD /QuHGahZnSv0XOlnYMwgosnd7FazRKm3u/E8aYJb/x04hy1Wk5pxD9TpKcjQT8A/y+LV maig== X-Gm-Message-State: AOAM530nlN+ODiXp+zOm5tFFZgCPspCjsC2Ae1B1xI6E91IhRODBFDOC +1V0ipvWAIH9Z48mW5JagF0= X-Google-Smtp-Source: ABdhPJwE+55knosR+8ffRZiPRdSADpNTwIDEQtqd4XoJx0T/1fPU6tA7ZE86xbhsWXT7Ga3knjR1zA== X-Received: by 2002:a17:907:2cc7:b0:6df:b76d:940d with SMTP id hg7-20020a1709072cc700b006dfb76d940dmr1407774ejc.742.1649925550815; Thu, 14 Apr 2022 01:39:10 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:10 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/7] staging: r8188eu: rename fields of struct rt_firmware_hdr Date: Thu, 14 Apr 2022 10:38:49 +0200 Message-Id: <20220414083853.3422-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename the fields of struct rt_firmware_hdr to avoid camel case. Signed-off-by: Michael Straube Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 --- drivers/staging/r8188eu/core/rtw_fw.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 323e0c634c4e..3da52a1ba23c 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -9,29 +9,29 @@ #define MAX_PAGE_SIZE 4096 =20 #define IS_FW_HEADER_EXIST(_fwhdr) \ - ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x92C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) + ((le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x92C0 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x88C0 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x2300 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x88E0) =20 struct rt_firmware_hdr { - __le16 Signature; - u8 Category; - u8 Function; - __le16 Version; - u8 Subversion; - u8 Rsvd1; - u8 Month; - u8 Date; - u8 Hour; - u8 Minute; - __le16 RamCodeSize; - u8 Foundry; - u8 Rsvd2; - __le32 SvnIdx; - __le32 Rsvd3; - __le32 Rsvd4; - __le32 Rsvd5; + __le16 signature; + u8 category; + u8 function; + __le16 version; + u8 subversion; + u8 rsvd1; + u8 month; + u8 date; + u8 hour; + u8 minute; + __le16 ramcodesize; + u8 foundry; + u8 rsvd2; + __le32 svnidx; + __le32 rsvd3; + __le32 rsvd4; + __le32 rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) @@ -254,9 +254,9 @@ int rtl8188e_firmware_download(struct adapter *padapter) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - fw_version =3D le16_to_cpu(fwhdr->Version); - fw_subversion =3D fwhdr->Subversion; - fw_signature =3D le16_to_cpu(fwhdr->Signature); + fw_version =3D le16_to_cpu(fwhdr->version); + fw_subversion =3D fwhdr->subversion; + fw_signature =3D le16_to_cpu(fwhdr->signature); =20 if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", --=20 2.35.1 From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6710BC433F5 for ; Thu, 14 Apr 2022 08:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241019AbiDNIl7 (ORCPT ); Thu, 14 Apr 2022 04:41:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240997AbiDNIlh (ORCPT ); Thu, 14 Apr 2022 04:41:37 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7489265156 for ; Thu, 14 Apr 2022 01:39:13 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id bg10so8687291ejb.4 for ; Thu, 14 Apr 2022 01:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/gsZkfzMYeP6pd9u0lclNFF+p8O0+cqjChmSOXbRt/s=; b=a6JNmB/1Y+0744TawNZF7bHnULrgn0WJoR9vfTcNGTJQOStR5EnKZmlkcsHvICtUb3 Dc/FcQcL9QW7r4HEYNO6vWtDunogH09b/LARrvb0VjRrONenywo9QLYDcRrjxG4q+H+Z wSBTZ1cfW7NAjgSq4w+6yblSTTG9FzaxDAd49U4ljUeBmx4qI88gvnFZ8/g99O3L3m/O 4qBxCv1xAD4Zs+H4yV+sqY/9HFvEhLOMxVDQXAi9O5hobFNICMt4SOrNB+zSkat6XuOj X13VVLVTKtdz10i4MQ02n9a6q+mOxlS9vGF4lShaaK0pk37ckV8P0Bb10ZtegPkReaAw Svrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/gsZkfzMYeP6pd9u0lclNFF+p8O0+cqjChmSOXbRt/s=; b=QHpRuRdLGOmvZjtWS/5lz2yvMiDKmBwPX6OKESRqo/g1fgcqf3on62Rb+c5OIqpODx xj2ZCdb+nwo4YhRX7Jf6GYJRsw8PQxng9UkaZHWLeQR1aIp1RnqdNDC7nsU9suKJf7aD 65rgHFuQvqXebnv3kCy6u1w1J0CzqMec2sdsAeMjjlcHCEY29VoSrw7fznYd5458E/47 jng59ORWdlPX2XTmBUO5AOB9VvFcIIli0LX+tYEji0yya5qI5CYBW+DcQvGEs2MfR/tg DzLwPJdTvqAeyT3D4OhIAlRsiCRX5SEQ4uQKJXK7S5V4fzAHRi4x156Lt2jmhmxC5evr ld6g== X-Gm-Message-State: AOAM532KBDlxr0XGXswj4b4VriNWEgOIa+LWvqD1tQy0yoT3738ylUDq xhSWSrCbX/NH1bVoW6E8aXk= X-Google-Smtp-Source: ABdhPJwDrsDJJ3+KXOfLLIl/Cc68yJARYtkYEORg3Cdb6DIX9ZWWzFyfC4dqP7JkhkyTVTAAxtapvQ== X-Received: by 2002:a17:907:6ea7:b0:6df:c5a2:89ca with SMTP id sh39-20020a1709076ea700b006dfc5a289camr1395445ejc.18.1649925551946; Thu, 14 Apr 2022 01:39:11 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:11 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/7] staging: r8188eu: use sizeof instead of hardcoded firmware header size Date: Thu, 14 Apr 2022 10:38:50 +0200 Message-Id: <20220414083853.3422-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use sizeof() instead of hardcoding the firmware header size. Signed-off-by: Michael Straube Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 --- drivers/staging/r8188eu/core/rtw_fw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 3da52a1ba23c..94526064f29b 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -263,9 +263,8 @@ int rtl8188e_firmware_download(struct adapter *padapter) DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { - /* Shift 32 bytes for FW header */ - fw_data =3D fw_data + 32; - fw_size =3D fw_size - 32; + fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); + fw_size =3D fw_size - sizeof(struct rt_firmware_hdr); } =20 /* Suggested by Filen. If 8051 is running in RAM code, driver should inf= orm Fw to reset by itself, */ --=20 2.35.1 From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 843B4C433F5 for ; Thu, 14 Apr 2022 08:39:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241091AbiDNImG (ORCPT ); Thu, 14 Apr 2022 04:42:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241003AbiDNIli (ORCPT ); Thu, 14 Apr 2022 04:41:38 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A83665158 for ; Thu, 14 Apr 2022 01:39:14 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id t11so8615588eju.13 for ; Thu, 14 Apr 2022 01:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HMcu7zgQS9k0Bz6hvTLZm8qcxNG9rHsrt5l+a1uteew=; b=HxxLqMTpDnGghlOJCrI6VO3kHrRfInik98yusjKYaUCi3PDZAzBVo7Cmyqj9l/M9vI eM7XVIgzkTlb8JUdACCp03XO2lX9kUsMcyJ8o1ENHF07lM6tKA9RsQkHi+3Y/o7gkO1e ZIJnoAcz/dnvPjbMpJaJulo125qo0mTYoh+l06i/zlm9R8BZCRhJuVmV500t7CY/lLUw k5pRX/EQAZxPHDsj0Z4l4gXX1OvsRbXQ2FbeH+d+eGjlu/grZkoaNVlpe8MIW+LN3QLX RbRcd6/hFa6/KXqubsywYOCC73ogDUtvKdJlnddbohT7ikSZTkLozY+mOb26PZ9BqSyl tGxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HMcu7zgQS9k0Bz6hvTLZm8qcxNG9rHsrt5l+a1uteew=; b=Sg27pVkDmVjBNih59u1l58OfKsJC+nScJpYBQ4Hg12A15jJj4MkSKRYZXF0xI2ibr7 MUIzLydVY4mmEo03TP1F5v4WwEsJ/VDfmQIpVnSSw5xR8XMDAnhHZbf1VfxAyqxRHRUj qB74AyHZbd4tp0kpbJ2kC7YhfBiufJsAIOgF7q8k/tweLh5/uC5zyDXI/B5KCbokfgap 3b+Xtxsf3zj1iT8rJWSMHE3ISsoug3/09Exfuqhh2Ok0n5xQLEFIMnjKHqg9MydSJeoq hL3FPbyShKKI/N7+jXc3pC3mseJdalqFfiut+S+wqCkjyyenOIm6ywawih9JMYwFohZn d6EQ== X-Gm-Message-State: AOAM530LQMTo4+YkNWoMT1sXHwD98mLr4hZSy4/HRTL8aT/MnWuv5Xfx IrEfQWHPQBwvIAwQjJOv93s= X-Google-Smtp-Source: ABdhPJx2hyNJ1+jIf+8bbw/F8ew0aElmPrta6mWMlt6UVwiX2Bw7bpuKF5a4nXYSP4kd//T4qqNPXQ== X-Received: by 2002:a17:907:d90:b0:6eb:557e:91e6 with SMTP id go16-20020a1709070d9000b006eb557e91e6mr1318440ejc.376.1649925552933; Thu, 14 Apr 2022 01:39:12 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:12 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/7] staging: r8188eu: remove variables from rtl8188e_firmware_download() Date: Thu, 14 Apr 2022 10:38:51 +0200 Message-Id: <20220414083853.3422-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The local variables fw_version, fw_subversion, fw_signature in rtl8188e_firmware_download() are only used in one place. Use the assigned values directly and remove the variables to make the code shorter and cleaner. Signed-off-by: Michael Straube Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 --- drivers/staging/r8188eu/core/rtw_fw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 94526064f29b..cbc4980bd938 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -237,7 +237,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct dvobj_priv *dvobj =3D adapter_to_dvobj(padapter); struct device *device =3D dvobj_to_dev(dvobj); struct rt_firmware_hdr *fwhdr =3D NULL; - u16 fw_version, fw_subversion, fw_signature; u8 *fw_data; u32 fw_size; static int log_version; @@ -254,13 +253,10 @@ int rtl8188e_firmware_download(struct adapter *padapt= er) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - fw_version =3D le16_to_cpu(fwhdr->version); - fw_subversion =3D fwhdr->subversion; - fw_signature =3D le16_to_cpu(fwhdr->signature); - if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); --=20 2.35.1 From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34AC8C433FE for ; Thu, 14 Apr 2022 08:40:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238640AbiDNImT (ORCPT ); Thu, 14 Apr 2022 04:42:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241006AbiDNIli (ORCPT ); Thu, 14 Apr 2022 04:41:38 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20CAA6515D for ; Thu, 14 Apr 2022 01:39:15 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id bh17so8660902ejb.8 for ; Thu, 14 Apr 2022 01:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UqSU6uGvzefM7JqsLVkp47vheVpreBM8RRaia816jV8=; b=fJxEecFFxrOn0EueDfzfdFYNkDi7VyjFuEqZA68NnzPDC5IOQ4sffH4hGLLmq+v6JF bD2CrcrYFhseb01NvTx9njFY+1/vVGY8a4gcV33l7BgBHnH77viHZowL9By7aO7rRWxx SSFAqSdbLT490hWUKaUMDqIiRsYj/FIW8+98fPf5xE5Pf18m7B85JkUPuKFOxE1X7Oq0 mKQEaQD4TFRaH5nZpv8RgQD/1bZfuXOIbZFoIMXcL7jtIhNyIDghw2Ndf8y14DNxvunv VqmejS60wgWOrpaEOLBXXX6JG2g+qOIDthLzSnWeVMhSFQEmvMYREiArRbS/EVYbfyA0 8G7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UqSU6uGvzefM7JqsLVkp47vheVpreBM8RRaia816jV8=; b=3OV1i4URDHW8RCzQALlc8gFJhCo+7HiaaR1bv4PboAF9f1Fhkp72ruTLVGwiy6Ulws ObWu8v1xoeLJfbCO9Q1a9ZUcXHw1jCsUf8VDaL8qJEENPMISZd5yYKRXGO+Gq7VS4PiH lQ83zS5DLIqVMXDWIL6I1sQaSi0o2Ip2NAa5ftNa8JHePPWkddwXmwyoi7y4w4HJ5pfT P9cqhN3pfsAXO3RIPYmyJI7xLbJx1HeybfqvXSMrSC1MMB6KUZpRuG7EcCGGyR0GH74B UmDDlaE3YBXe6hvzy2OIfuaRNTp/n1AGm/EBwwF0RHJU9bR2tD4G8VwvFiFhVY7vhEsY yqlA== X-Gm-Message-State: AOAM531c6/0hJXlR4CgDErSdloX8iEQoR9Qb2VVsMgQsQIFVqEltq64o BaeT+L2oNVVwxAwWj5DKXq8= X-Google-Smtp-Source: ABdhPJwpaGNjqIdCer8Ui1XN0n5nWE6nuXkwc31+cYETm/IFNZdI5z9zF3n+PWmvD1dljt9eHeVfCg== X-Received: by 2002:a17:906:c091:b0:6db:62b6:f4cc with SMTP id f17-20020a170906c09100b006db62b6f4ccmr1413652ejz.607.1649925553721; Thu, 14 Apr 2022 01:39:13 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:13 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 6/7] staging: r8188eu: always log firmware info Date: Thu, 14 Apr 2022 10:38:52 +0200 Message-Id: <20220414083853.3422-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The local static variable log_version prevents logging the firmware information more than once, e.g. when the device is unplugged and plugged again. That is not necessary and complicates the code. Remove it. Signed-off-by: Michael Straube Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 --- drivers/staging/r8188eu/core/rtw_fw.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index cbc4980bd938..64963507a346 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -239,7 +239,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct rt_firmware_hdr *fwhdr =3D NULL; u8 *fw_data; u32 fw_size; - static int log_version; =20 if (!dvobj->firmware.data) ret =3D load_firmware(&dvobj->firmware, device); @@ -253,10 +252,9 @@ int rtl8188e_firmware_download(struct adapter *padapte= r) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - if (!log_version++) - pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, - le16_to_cpu(fwhdr->signature)); + pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); --=20 2.35.1 From nobody Mon May 11 04:51:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 272CAC433EF for ; Thu, 14 Apr 2022 08:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241106AbiDNImN (ORCPT ); Thu, 14 Apr 2022 04:42:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241017AbiDNIlp (ORCPT ); Thu, 14 Apr 2022 04:41:45 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F215165162 for ; Thu, 14 Apr 2022 01:39:15 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id bv19so8676928ejb.6 for ; Thu, 14 Apr 2022 01:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MKr6+nokaP5roHlN/q4ijMaD9NBWjAMlhiHPQJ7ZvGk=; b=oniU/Uq3TeyE1RRKqecnWnMSlfxvLzAYhLrtXrsQi/DbEJVioabJ68fJ2fzEAONfv3 PTXE5o7eZtavasDpjuVTRgMYiIZpJXZw9fxA0pj6VxY/1+ZzSrYTGi0n9KnS484YReGC VYzLKA4w48x2iRhJAbiI8zOq5Xj3fYPoxJsz54bx3LiuJAxzIGT3U0i/9pADtcUxs9AZ +yu3p+XsitFpkVf/42TCGBtTWUrOdBUd6QsNK+dKakZNr+Vl1a+HSvQiUQWzx2v2AFfQ o+gdFAJd8lFQKksN8onibvaSN65QbQWy1AQzNBkq0p1fRf/FabGKIq6Q8xfJ1ZZ0FW6I xeEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKr6+nokaP5roHlN/q4ijMaD9NBWjAMlhiHPQJ7ZvGk=; b=Rx3BiqEyFHiQM9nl2y2njIWCgoOrT+E6QCbqRlcXMqQxb6GjI07JxQennqps/pREge nCEezMNJTAIe3mN6zMCyfSrtSABoMYiYKEGTt9yVfVfjQ82rxsjprH6blG6VZztiFlPa 5/QLUH6qJb2Hpm9qMOXBOInIVmveTxV8N6u8cfb+3su5k73KPOjm71P4qBKnPzCeCUs2 elQlH4vCFQR7VHX8ztNZpkc5jbjo3LwYY/CiVhD+m/wDEthXZT0fBCj0W525d5FGDp9g a2uxe6cQ4ErwtXTuurQM4AZkRL+EQM3EH9MJGJEbQosw62baPaWlKV2ONnj/kXr7geZE 976g== X-Gm-Message-State: AOAM531OMLcqaWhri8ByeuC3K83gEUZ0CaOvN44MhxIQXSVlUvG3eMoE sftHIfhzFQjCA2VRMioz2rcXT0/+xVw= X-Google-Smtp-Source: ABdhPJy5szr413gn7qjTFI6nqX63l6W0BasX2s06CfKfEkZH3jn5PKE+Z7W4opnLFE/sl6D9g15jqA== X-Received: by 2002:a17:907:3f25:b0:6b0:5e9a:83 with SMTP id hq37-20020a1709073f2500b006b05e9a0083mr1451660ejc.659.1649925554546; Thu, 14 Apr 2022 01:39:14 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id ah13-20020a1709069acd00b006e8a0b3e071sm418138ejc.110.2022.04.14.01.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 01:39:14 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 7/7] staging: r8188eu: check firmware header existence before access Date: Thu, 14 Apr 2022 10:38:53 +0200 Message-Id: <20220414083853.3422-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com> References: <20220414083853.3422-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We should access the fields of fwhdr only if the check for firmware header existence is true. Move the affected code into the if block that checks firmware header existence. Signed-off-by: Michael Straube Acked-by: Larry Finger for 2/7 through 5/7. Pat= ch=20 --- Do we need the IS_FW_HEADER_EXIST(fwhdr) check at all? The header _does_ exist in rtl8188eufw.bin and it's very unlikely that it ever changes _and_ the header will be removed. drivers/staging/r8188eu/core/rtw_fw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 64963507a346..c58bce1a1856 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -249,14 +249,13 @@ int rtl8188e_firmware_download(struct adapter *padapt= er) fw_data =3D dvobj->firmware.data; fw_size =3D dvobj->firmware.size; =20 - /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, - le16_to_cpu(fwhdr->signature)); - if (IS_FW_HEADER_EXIST(fwhdr)) { + pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); + fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); fw_size =3D fw_size - sizeof(struct rt_firmware_hdr); } --=20 2.35.1