staging:rtl8187se: Fix sparse warning restricted __le16 degrades to integer
authorHimangi Saraogi <himangi774@gmail.com>
Mon, 10 Mar 2014 03:19:23 +0000 (08:49 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Mar 2014 17:05:06 +0000 (10:05 -0700)
This patch fixes the following sparse warning in r8180_core.c - warning:
restricted __le16 degrades to integer. Also, the variable morefrag is
changed to bool as it is being used as a bool.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8187se/r8180_core.c

index 79ec26317598306b4e660de410392a60c41c8b34..bb405ff4ba3ce7bcaca898cd31ce07e4d692f2ac 100644 (file)
@@ -1579,7 +1579,7 @@ static void rtl8180_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
        int mode;
        struct ieee80211_hdr_3addr *h = (struct ieee80211_hdr_3addr *)skb->data;
-       short morefrag = (h->frame_control) & IEEE80211_FCTL_MOREFRAGS;
+       bool morefrag = le16_to_cpu(h->frame_control) & IEEE80211_FCTL_MOREFRAGS;
        unsigned long flags;
        int priority;
 
@@ -1807,7 +1807,7 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
                        TxDescDuration = ThisFrameTime + aSifsTime + AckTime;
                }
 
-               if (!(frag_hdr->frame_control & IEEE80211_FCTL_MOREFRAGS)) {
+               if (!(le16_to_cpu(frag_hdr->frame_control) & IEEE80211_FCTL_MOREFRAGS)) {
                        /* ThisFrame-ACK. */
                        Duration = aSifsTime + AckTime;
                } else { /* One or more fragments remained. */