public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings
@ 2015-06-02  0:43 Gaston Gonzalez
  2015-06-02  5:39 ` Sudip Mukherjee
  0 siblings, 1 reply; 3+ messages in thread
From: Gaston Gonzalez @ 2015-06-02  0:43 UTC (permalink / raw)
  To: gregkh, joe
  Cc: cristina.opriceana, hamohammed.sa, gdonald, mahfouz.saif.elyazal,
	paul.gortmaker, devel, linux-kernel, gascoar

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32:    expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32:    got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50:    left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50:    right side has type int

Signed-off-by: Gaston Gonzalez <gascoar@gmail.com>
---
Changes since V1: rearrange the code to set auth->header.frame_ctl only once.

 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index d2e8b12..d0a6a59 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -660,8 +660,10 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	if (challengelen)
+		auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH | IEEE80211_FCTL_WEP);
+	else
+		auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
-- 
2.4.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings
  2015-06-02  0:43 [PATCH v2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings Gaston Gonzalez
@ 2015-06-02  5:39 ` Sudip Mukherjee
  2015-06-02 14:39   ` Gaston Gonzalez
  0 siblings, 1 reply; 3+ messages in thread
From: Sudip Mukherjee @ 2015-06-02  5:39 UTC (permalink / raw)
  To: Gaston Gonzalez
  Cc: gregkh, joe, devel, hamohammed.sa, gdonald, linux-kernel,
	paul.gortmaker, cristina.opriceana

On Mon, Jun 01, 2015 at 09:43:31PM -0300, Gaston Gonzalez wrote:
> Fix the following sparse warnings:
> 
>  drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> index d2e8b12..d0a6a59 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> @@ -660,8 +660,10 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
>  	auth = (struct ieee80211_authentication *)
>  		skb_put(skb, sizeof(struct ieee80211_authentication));
>  
> -	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
> -	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
> +	if (challengelen)
> +		auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH | IEEE80211_FCTL_WEP);
it is introducing new checkpatch warning of "line over 80 characters".

regards
sudip

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings
  2015-06-02  5:39 ` Sudip Mukherjee
@ 2015-06-02 14:39   ` Gaston Gonzalez
  0 siblings, 0 replies; 3+ messages in thread
From: Gaston Gonzalez @ 2015-06-02 14:39 UTC (permalink / raw)
  To: Sudip Mukherjee
  Cc: gregkh, joe, devel, hamohammed.sa, gdonald, linux-kernel,
	paul.gortmaker, cristina.opriceana

On Tue, Jun 02, 2015 at 11:09:41AM +0530, Sudip Mukherjee wrote:
> On Mon, Jun 01, 2015 at 09:43:31PM -0300, Gaston Gonzalez wrote:
> > Fix the following sparse warnings:
> > 
> >  drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> > index d2e8b12..d0a6a59 100644
> > --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> > +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> > @@ -660,8 +660,10 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
> >  	auth = (struct ieee80211_authentication *)
> >  		skb_put(skb, sizeof(struct ieee80211_authentication));
> >  
> > -	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
> > -	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
> > +	if (challengelen)
> > +		auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH | IEEE80211_FCTL_WEP);
> it is introducing new checkpatch warning of "line over 80 characters".
> 
> regards
> sudip
Yes, you are right. I'll send a v3 including with that fixed.

Thanks for the feedback,

Gaston

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-06-02 14:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-02  0:43 [PATCH v2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings Gaston Gonzalez
2015-06-02  5:39 ` Sudip Mukherjee
2015-06-02 14:39   ` Gaston Gonzalez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox