Skip to contentSkip to conversation

staging: rtl8192u: ieee80211: Fix sparse endianness warnings

PATCH Superseded Gaston Gonzalez 2 participants 3 messages Jun 2, 2015 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: rtl8192u: ieee80211: Fix sparse endianness warnings

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

---
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(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +4 -2
index d2e8b12..d0a6a59 100644
@@ -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
 
Signature · 1 line
2.4.2
#1 lore raw
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

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

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be · line 664

Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +2 -2
@@ -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

#2 lore raw
Quoted 14 lines · Sudip Mukherjee
Quoted 13 lines · Gaston Gonzalez

Fix the following sparse warnings:

 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -0
index d2e8b12..d0a6a59 100644
@@ -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));
 
Quoted 8 lines

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be · line 664

Quoted 4 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +2 -2
-	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