[PATCH v3] staging: rtl8192u: ieee80211: Fix sparse endianness warnings

2015-06-02 Thread Gaston Gonzalez
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 
---
Changes since V2: fix line over 80 chararcters.

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

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c 
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index d2e8b12..8e18674 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -660,8 +660,11 @@ 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.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH v3] staging: rtl8192u: ieee80211: Fix sparse endianness warnings

2015-06-02 Thread Gaston Gonzalez
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 gasc...@gmail.com
---
Changes since V2: fix line over 80 chararcters.

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

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c 
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index d2e8b12..8e18674 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -660,8 +660,11 @@ 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.1.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/