OSDN Git Service

staging: wlan-ng: add missing byte order conversion
authorIgor Pylypiv <igor.pylypiv@gmail.com>
Tue, 31 Jan 2017 05:39:54 +0000 (21:39 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 May 2017 12:00:20 +0000 (14:00 +0200)
commit 2c474b8579e9b67ff72b2bcefce9f53c7f4469d4 upstream.

Conversion macros le16_to_cpu was removed and that caused new sparse warning

sparse output:
drivers/staging/wlan-ng/p80211netdev.c:241:44: warning: incorrect type in argument 2 (different base types)
drivers/staging/wlan-ng/p80211netdev.c:241:44:    expected unsigned short [unsigned] [usertype] fc
drivers/staging/wlan-ng/p80211netdev.c:241:44:    got restricted __le16 [usertype] fc

Fixes: 7ad82572348c ("staging:wlan-ng:Fix sparse warning")
Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wlan-ng/p80211netdev.c

index 825a63a..2e075a6 100644 (file)
@@ -232,7 +232,7 @@ static int p80211_convert_to_ether(struct wlandevice *wlandev, struct sk_buff *s
        struct p80211_hdr_a3 *hdr;
 
        hdr = (struct p80211_hdr_a3 *)skb->data;
-       if (p80211_rx_typedrop(wlandev, hdr->fc))
+       if (p80211_rx_typedrop(wlandev, le16_to_cpu(hdr->fc)))
                return CONV_TO_ETHER_SKIPPED;
 
        /* perform mcast filtering: allow my local address through but reject