leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wlan-ng: reduce type warnings

Browse Source 
Fixes the following sparse output:

drivers/staging/wlan-ng/p80211conv.c:132:25: warning: cast to restricted __be16
drivers/staging/wlan-ng/p80211conv.c:132:25: warning: cast to restricted __be16
drivers/staging/wlan-ng/p80211conv.c:132:25: warning: cast to restricted __be16
drivers/staging/wlan-ng/p80211conv.c:132:25: warning: cast to restricted __be16
drivers/staging/wlan-ng/p80211conv.c:154:38: warning: incorrect type in assignment (different base types)
drivers/staging/wlan-ng/p80211conv.c:154:38:    expected unsigned short [unsigned] [usertype] type
drivers/staging/wlan-ng/p80211conv.c:154:38:    got restricted __be16 [usertype] <noident>
drivers/staging/wlan-ng/p80211conv.c:390:42: warning: cast to restricted __le16
drivers/staging/wlan-ng/p80211conv.c:413:29: warning: incorrect type in assignment (different base types)
drivers/staging/wlan-ng/p80211conv.c:413:29:    expected unsigned short [unsigned] [usertype] type
drivers/staging/wlan-ng/p80211conv.c:413:29:    got restricted __be16 [usertype] <noident>
drivers/staging/wlan-ng/p80211conv.c:481:29: warning: incorrect type in assignment (different base types)
drivers/staging/wlan-ng/p80211conv.c:481:29:    expected unsigned short [unsigned] [usertype] type
drivers/staging/wlan-ng/p80211conv.c:481:29:    got restricted __be16 [usertype] <noident>

Signed-off-by: Alexander Alemayhu <alexander@alemayhu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Alemayhu 2017-02-11 11:13:47 +01:00 committed by Greg Kroah-Hartman
parent aefc958960
commit 606ea2bd81
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wlan-ng/p80211conv.c
View File

@ -387,7 +387,7 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
(((memcmp(e_snap->oui, oui_rfc1042, (((memcmp(e_snap->oui, oui_rfc1042,
WLAN_IEEE_OUI_LEN) == 0) && WLAN_IEEE_OUI_LEN) == 0) &&
(ethconv == WLAN_ETHCONV_8021h) && (ethconv == WLAN_ETHCONV_8021h) &&
(p80211_stt_findproto(le16_to_cpu(e_snap->type)))) || (p80211_stt_findproto(be16_to_cpu(e_snap->type)))) ||
(memcmp(e_snap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN) != (memcmp(e_snap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN) !=
0))) { 0))) {
pr_debug("SNAP+RFC1042 len: %d\n", payload_length); pr_debug("SNAP+RFC1042 len: %d\n", payload_length);

4
drivers/staging/wlan-ng/p80211conv.h
View File

@ -130,7 +130,7 @@ struct p80211_metawep {
struct wlan_ethhdr { struct wlan_ethhdr {
u8 daddr[ETH_ALEN]; u8 daddr[ETH_ALEN];
u8 saddr[ETH_ALEN]; u8 saddr[ETH_ALEN];
u16 type; __be16 type;
} __packed; } __packed;
/* local llc header type */ /* local llc header type */
@ -143,7 +143,7 @@ struct wlan_llc {
/* local snap header type */ /* local snap header type */
struct wlan_snap { struct wlan_snap {
u8 oui[WLAN_IEEE_OUI_LEN]; u8 oui[WLAN_IEEE_OUI_LEN];
u16 type; __be16 type;
} __packed; } __packed;
/* Circular include trick */ /* Circular include trick */