Re: [PATCH 2/3] staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0

[Larry Finger <Larry.Finger@lwfinger.net>]

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