From: Larry Finger <Larry.Finger@lwfinger•net>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>,
gregkh@linuxfoundation•org
Cc: devel@driverdev•osuosl.org, netdev@vger•kernel.org,
Stable <stable@vger•kernel.org>
Subject: Re: [PATCH 2/3] staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0
Date: Wed, 09 Apr 2014 12:44:54 -0500 [thread overview]
Message-ID: <53458716.6040803@lwfinger.net> (raw)
In-Reply-To: <53457428.4030408@cogentembedded.com>
On 04/09/2014 11:24 AM, Sergei Shtylyov wrote:
> On 04/09/2014 08:12 PM, Larry Finger wrote:
>
>> Zero-initializing ether_type masked that the ether type would never be
>> obtained for 8021x packets and the comparition against eapol_type
>> would always fail.
>
>> Reported-by: Jes Sorensen <Jes.Sorensen@redhat•com>
>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger•net>
>> Cc: Stable <stable@vger•kernel.org>
>> ---
>> drivers/staging/rtl8188eu/core/rtw_recv.c | 20 ++++++++------------
>> 1 file changed, 8 insertions(+), 12 deletions(-)
>
>> diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c
>> b/drivers/staging/rtl8188eu/core/rtw_recv.c
>> index 01fcabc..61084d6 100644
>> --- a/drivers/staging/rtl8188eu/core/rtw_recv.c
>> +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
>> @@ -551,7 +551,7 @@ static struct recv_frame *portctrl(struct adapter *adapter,
>> struct sta_info *psta;
>> struct sta_priv *pstapriv;
>> struct recv_frame *prtnframe;
>> - u16 ether_type = 0;
>> + u16 ether_type;
>
> I suggest:
>
> u16 ethertype;
>
>> u16 eapol_type = 0x888e;/* for Funia BD's WPA issue */
>> struct rx_pkt_attrib *pattrib;
>> __be16 be_tmp;
>> @@ -571,19 +571,17 @@ static struct recv_frame *portctrl(struct adapter *adapter,
>>
>> RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
>> ("########portctrl:adapter->securitypriv.dot11AuthAlgrthm=%d\n",
>> adapter->securitypriv.dot11AuthAlgrthm));
>>
>> - if (auth_alg == 2) {
>> + if (auth_alg == dot11AuthAlgrthm_8021X) {
>> + /* get ether_type */
>> + ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;
>
> Why not:
>
> ptr += pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;
It seems to me that it is only a matter of preference. Exactly the same object
code will be generated. If saving 5 characters in the source file is really
important, then I think I'm in the wrong business.
Larry
next prev parent reply other threads:[~2014-04-09 17:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-09 16:12 [PATCH 0/3] Fix some bugs in staging drivers Larry Finger
2014-04-09 16:12 ` [PATCH 1/3] staging: r8188eu: Calling rtw_get_stainfo() with a NULL sta_addr will return NULL Larry Finger
2014-04-09 16:12 ` [PATCH 2/3] staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0 Larry Finger
2014-04-09 16:24 ` Sergei Shtylyov
2014-04-09 17:44 ` Larry Finger [this message]
2014-04-09 19:02 ` Dan Carpenter
2014-04-09 19:11 ` Sergei Shtylyov
2014-04-09 19:44 ` Dan Carpenter
2014-04-09 18:51 ` Dan Carpenter
2014-04-09 19:00 ` Dan Carpenter
2014-04-10 9:14 ` David Laight
2014-04-16 18:45 ` Greg KH
2014-04-09 16:13 ` [PATCH 3/3] staging: r8712u: " Larry Finger
2014-04-09 16:25 ` Sergei Shtylyov
2014-04-09 17:45 ` Larry Finger
2014-04-16 18:46 ` Greg KH
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=53458716.6040803@lwfinger.net \
--to=larry.finger@lwfinger$(echo .)net \
--cc=devel@driverdev$(echo .)osuosl.org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sergei.shtylyov@cogentembedded$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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