* [PATCH RESEND 2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings
@ 2015-06-01 21:30 Gaston Gonzalez
2015-06-01 21:43 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Gaston Gonzalez @ 2015-06-01 21:30 UTC (permalink / raw)
To: gregkh
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>
---
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index d2e8b12..bda961c 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -660,8 +660,9 @@ 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;
+ auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+ if (challengelen)
+ auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
auth->header.duration_id = 0x013a; //FIXME
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings
2015-06-01 21:30 [PATCH RESEND 2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings Gaston Gonzalez
@ 2015-06-01 21:43 ` Joe Perches
2015-06-01 23:44 ` Gaston Gonzalez
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2015-06-01 21:43 UTC (permalink / raw)
To: Gaston Gonzalez
Cc: gregkh, cristina.opriceana, hamohammed.sa, gdonald,
mahfouz.saif.elyazal, paul.gortmaker, devel, linux-kernel
On Mon, 2015-06-01 at 18:30 -0300, Gaston Gonzalez wrote:
> Fix the following sparse warnings:
[]
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
[]
> @@ -660,8 +660,9 @@ 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;
> + auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
> + if (challengelen)
> + auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
It'd be better to use normal tab indentation and likely
it'd also be better to set this only once
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);
or maybe a single line
auth->header.frame_ctl = cpu_to_le16(challengelen ? IEEE80211_STYPE_AUTH | IEEE80211_FCTL_WEP : IEEE80211_STYPE_AUTH);
though I think the first is simpler to read.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings
2015-06-01 21:43 ` Joe Perches
@ 2015-06-01 23:44 ` Gaston Gonzalez
0 siblings, 0 replies; 3+ messages in thread
From: Gaston Gonzalez @ 2015-06-01 23:44 UTC (permalink / raw)
To: Joe Perches
Cc: gregkh, cristina.opriceana, hamohammed.sa, gdonald,
mahfouz.saif.elyazal, paul.gortmaker, devel, linux-kernel
On Mon, Jun 01, 2015 at 02:43:28PM -0700, Joe Perches wrote:
> On Mon, 2015-06-01 at 18:30 -0300, Gaston Gonzalez wrote:
> > Fix the following sparse warnings:
> []
> > diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> []
> > @@ -660,8 +660,9 @@ 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;
> > + auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
> > + if (challengelen)
> > + auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
>
> It'd be better to use normal tab indentation and likely
> it'd also be better to set this only once
>
> 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);
>
> or maybe a single line
>
> auth->header.frame_ctl = cpu_to_le16(challengelen ? IEEE80211_STYPE_AUTH | IEEE80211_FCTL_WEP : IEEE80211_STYPE_AUTH);
>
> though I think the first is simpler to read.
>
>
Thanks for the feedback.
I'll send a v2 making the changes according to your first option.
regards,
Gaston
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-01 23:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-01 21:30 [PATCH RESEND 2] staging: rtl8192u: ieee80211: Fix sparse endianness warnings Gaston Gonzalez
2015-06-01 21:43 ` Joe Perches
2015-06-01 23:44 ` Gaston Gonzalez
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).