From: Phillip Potter <phil@philpotter.co.uk>
To: Pavel Skripkin <paskripkin@gmail.com>
Cc: dan.carpenter@oracle.com, Larry.Finger@lwfinger.net,
straube.linux@gmail.com, martin@kaiser.cx,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 02/10] staging: r8188eu: remove smaller sets of DBG_88E calls from core dir
Date: Wed, 26 Jan 2022 01:00:15 +0000 [thread overview]
Message-ID: <YfCdH8PS9fV2flw2@equinox> (raw)
In-Reply-To: <47fcbfb5-ee59-a1ef-781d-83989e26e1aa@gmail.com>
On Tue, Jan 25, 2022 at 09:17:46PM +0300, Pavel Skripkin wrote:
> Hi Phillip,
>
> On 1/25/22 01:44, Phillip Potter wrote:
> > Remove all DBG_88E calls from the core directory, other than those in
> > core/rtw_mlme_ext.c, as this contains over 100 on its own so will be
> > done in a separate patch for ease of review. These calls do not conform
> > to kernel coding standards and are superfluous. Also restructure where
> > appropriate to remove no longer needed code left behind by removal of
> > these calls. This will allow the eventual removal of the DBG_88E macro
> > itself.
> >
> > Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
> > ---
>
> [code snip]
>
> > diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c
> > index ad87954bdeb4..62354c3194bd 100644
> > --- a/drivers/staging/r8188eu/core/rtw_ieee80211.c
> > +++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c
> > @@ -653,13 +653,8 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
> > /* first 3 bytes in vendor specific information element are the IEEE
> > * OUI of the vendor. The following byte is used a vendor specific
> > * sub-type. */
> > - if (elen < 4) {
> > - if (show_errors) {
> > - DBG_88E("short vendor specific information element ignored (len=%lu)\n",
> > - (unsigned long)elen);
> > - }
> > + if (elen < 4)
> > return -1;
> > - }
>
> show_errors seems unused after this change
>
> > oui = RTW_GET_BE24(pos);
> > switch (oui) {
> > @@ -674,11 +669,8 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
> > elems->wpa_ie_len = elen;
> > break;
> > case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
> > - if (elen < 5) {
> > - DBG_88E("short WME information element ignored (len=%lu)\n",
> > - (unsigned long)elen);
> > + if (elen < 5)
> > return -1;
> > - }
> > switch (pos[4]) {
> > case WME_OUI_SUBTYPE_INFORMATION_ELEMENT:
> > case WME_OUI_SUBTYPE_PARAMETER_ELEMENT:
> > @@ -690,8 +682,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
> > elems->wme_tspec_len = elen;
> > break;
> > default:
> > - DBG_88E("unknown WME information element ignored (subtype=%d len=%lu)\n",
> > - pos[4], (unsigned long)elen);
> > return -1;
> > }
> > break;
> > @@ -701,8 +691,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
> > elems->wps_ie_len = elen;
> > break;
> > default:
> > - DBG_88E("Unknown Microsoft information element ignored (type=%d len=%lu)\n",
> > - pos[3], (unsigned long)elen);
> > return -1;
> > }
> > break;
> > @@ -714,14 +702,10 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
> > elems->vendor_ht_cap_len = elen;
> > break;
> > default:
> > - DBG_88E("Unknown Broadcom information element ignored (type=%d len=%lu)\n",
> > - pos[3], (unsigned long)elen);
> > return -1;
> > }
> > break;
> > default:
> > - DBG_88E("unknown vendor specific information element ignored (vendor OUI %02x:%02x:%02x len=%lu)\n",
> > - pos[0], pos[1], pos[2], (unsigned long)elen);
> > return -1;
> > }
> > return 0;
> > @@ -752,13 +736,8 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len,
> > elen = *pos++;
> > left -= 2;
> > - if (elen > left) {
> > - if (show_errors) {
> > - DBG_88E("IEEE 802.11 element parse failed (id=%d elen=%d left=%lu)\n",
> > - id, elen, (unsigned long)left);
> > - }
>
> same here
>
> > + if (elen > left)
> > return ParseFailed;
> > - }
> > switch (id) {
> > case WLAN_EID_SSID:
> > @@ -839,10 +818,6 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len,
> > break;
> > default:
> > unknown++;
> > - if (!show_errors)
> > - break;
> > - DBG_88E("IEEE 802.11 element parse ignored unknown element (id=%d elen=%d)\n",
> > - id, elen);
> > break;
>
> and here
>
>
>
> With regards,
> Pavel Skripkin
Thanks, will take a further look when I fix up for v2.
Regards,
Phil
next prev parent reply other threads:[~2022-01-26 1:00 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 22:44 [PATCH 00/10] Cleanup and removal of DBG_88E macro Phillip Potter
2022-01-24 22:44 ` [PATCH 01/10] staging: r8188eu: remove previously added dev_dbg and netdev_dbg calls Phillip Potter
2022-01-24 22:44 ` [PATCH 02/10] staging: r8188eu: remove smaller sets of DBG_88E calls from core dir Phillip Potter
2022-01-25 9:02 ` Dan Carpenter
2022-01-26 0:54 ` Phillip Potter
2022-01-26 6:00 ` Dan Carpenter
2022-01-25 18:17 ` Pavel Skripkin
2022-01-26 1:00 ` Phillip Potter [this message]
2022-01-24 22:44 ` [PATCH 03/10] staging: r8188eu: remove DBG_88E calls from core/rtw_mlme_ext.c Phillip Potter
2022-01-25 7:22 ` kernel test robot
2022-01-25 18:31 ` Pavel Skripkin
2022-01-26 1:02 ` Phillip Potter
2022-01-24 22:44 ` [PATCH 04/10] staging: r8188eu: remove all DBG_88E calls from hal dir Phillip Potter
2022-01-25 8:27 ` kernel test robot
2022-01-24 22:44 ` [PATCH 05/10] staging: r8188eu: remove smaller sets of DBG_88E calls from os_dep dir Phillip Potter
2022-01-25 12:48 ` Pavel Skripkin
2022-01-25 12:59 ` Dan Carpenter
2022-01-25 13:04 ` Pavel Skripkin
2022-01-25 13:07 ` Dan Carpenter
2022-01-26 0:58 ` Phillip Potter
2022-01-24 22:44 ` [PATCH 06/10] staging: r8188eu: remove DBG_88E calls from os_dep/ioctl_linux.c Phillip Potter
2022-01-25 9:31 ` kernel test robot
2022-01-25 19:03 ` Pavel Skripkin
2022-01-26 1:13 ` Phillip Potter
2022-01-26 10:26 ` Pavel Skripkin
2022-01-26 10:48 ` Greg KH
2022-01-26 10:58 ` Pavel Skripkin
2022-01-26 11:14 ` Greg KH
2022-01-27 8:53 ` Phillip Potter
2022-01-24 22:44 ` [PATCH 07/10] staging: r8188eu: remove DBG_88E call from include/usb_ops.h Phillip Potter
2022-01-24 22:44 ` [PATCH 08/10] staging: r8188eu: remove all remaining aliased DBG_88E calls Phillip Potter
2022-01-24 22:44 ` [PATCH 09/10] staging: r8188eu: remove DBG_88E macro definition Phillip Potter
2022-01-24 22:44 ` [PATCH 10/10] staging: r8188eu: remove GlobalDebugLevel flag Phillip Potter
2022-01-25 15:33 ` [PATCH 00/10] Cleanup and removal of DBG_88E macro Greg KH
2022-01-26 0:45 ` Phillip Potter
2022-01-24 22:50 [RESENT PATCH 00/10] staging: r8188eu: " Phillip Potter
2022-01-24 22:50 ` [PATCH 02/10] staging: r8188eu: remove smaller sets of DBG_88E calls from core dir Phillip Potter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YfCdH8PS9fV2flw2@equinox \
--to=phil@philpotter.co.uk \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=paskripkin@gmail.com \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).