Linux kernel staging patches
 help / color / mirror / Atom feed
From: Dan Carpenter <error27@gmail.com>
To: Martin Kaiser <martin@kaiser.cx>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Larry Finger <Larry.Finger@lwfinger.net>,
	Phillip Potter <phil@philpotter.co.uk>,
	Michael Straube <straube.linux@gmail.com>,
	Pavel Skripkin <paskripkin@gmail.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] staging: r8188eu: use a qos_hdr in validate_recv_data_frame
Date: Mon, 7 Nov 2022 15:54:21 +0300	[thread overview]
Message-ID: <Y2j//dFRONly9kU8@kadam> (raw)
In-Reply-To: <20221106170455.743058-2-martin@kaiser.cx>

On Sun, Nov 06, 2022 at 06:04:53PM +0100, Martin Kaiser wrote:
> Define a struct ieee80211_qos_hdr in the validate_recv_data_frame
> function. Use this struct to replace some numeric offsets and make the
> code easier to understand.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>  drivers/staging/r8188eu/core/rtw_recv.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
> index cb0f35d7ab98..245b931c483d 100644
> --- a/drivers/staging/r8188eu/core/rtw_recv.c
> +++ b/drivers/staging/r8188eu/core/rtw_recv.c
> @@ -1032,7 +1032,6 @@ static int validate_recv_data_frame(struct adapter *adapter,
>  				    struct recv_frame *precv_frame)
>  {
>  	struct sta_info *psta = NULL;
> -	u8 *ptr = precv_frame->rx_data;
>  	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)precv_frame->rx_data;
>  	struct rx_pkt_attrib	*pattrib = &precv_frame->attrib;
>  	struct security_priv	*psecuritypriv = &adapter->securitypriv;
> @@ -1071,10 +1070,12 @@ static int validate_recv_data_frame(struct adapter *adapter,
>  	pattrib->ack_policy = 0;
>  	/* parsing QC field */
>  	if (pattrib->qos) {
> +		struct ieee80211_qos_hdr *qos_hdr = (struct ieee80211_qos_hdr *)hdr;
> +
>  		pattrib->priority = ieee80211_get_tid(hdr);
> -		pattrib->ack_policy = GetAckpolicy((ptr + 24));
> -		pattrib->amsdu = GetAMsdu((ptr + 24));
> -		pattrib->hdrlen = 26;
                               ^^^

> +		pattrib->ack_policy = GetAckpolicy(&qos_hdr->qos_ctrl);
> +		pattrib->amsdu = GetAMsdu(&qos_hdr->qos_ctrl);
> +		pattrib->hdrlen += sizeof(*qos_hdr);
                               ^^^^
Why did this change from "=" to "+="?

regards,
dan carpenter


  reply	other threads:[~2022-11-07 12:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-06 17:04 [PATCH 0/3] staging: r8188eu: another round of cleanups Martin Kaiser
2022-11-06 17:04 ` [PATCH 1/3] staging: r8188eu: use a qos_hdr in validate_recv_data_frame Martin Kaiser
2022-11-07 12:54   ` Dan Carpenter [this message]
2022-11-07 20:27     ` Martin Kaiser
2022-11-06 17:04 ` [PATCH 2/3] staging: r8188eu: drop another removal/stop check Martin Kaiser
2022-11-06 17:04 ` [PATCH 3/3] staging: r8188eu: drop removal/stop check in dump_mgntframe_and_wait_ack Martin Kaiser
2022-11-07  6:23 ` [PATCH 0/3] staging: r8188eu: another round of cleanups Philipp Hortmann

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=Y2j//dFRONly9kU8@kadam \
    --to=error27@gmail.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=martin@kaiser.cx \
    --cc=paskripkin@gmail.com \
    --cc=phil@philpotter.co.uk \
    --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