Skip to content

Commit 2ed81e6

Browse files
lwfingergregkh
authored andcommitted
staging: r8712u: Fix Sparse warning in rtl871x_xmit.c
[ Upstream commit 07222e535831b916221dd2a48a3047ec7e45dc72 ] Sparse reports the following: CHECK drivers/staging/rtl8712/rtl871x_xmit.c drivers/staging/rtl8712/rtl871x_xmit.c:350:44: warning: restricted __le32 degrades to integer drivers/staging/rtl8712/rtl871x_xmit.c:491:23: warning: incorrect type in initializer (different base types) drivers/staging/rtl8712/rtl871x_xmit.c:491:23: expected unsigned short [usertype] *fctrl drivers/staging/rtl8712/rtl871x_xmit.c:491:23: got restricted __le16 *<noident> drivers/staging/rtl8712/rtl871x_xmit.c:580:36: warning: incorrect type in assignment (different base types) drivers/staging/rtl8712/rtl871x_xmit.c:580:36: expected unsigned short [unsigned] [short] [usertype] <noident> drivers/staging/rtl8712/rtl871x_xmit.c:580:36: got restricted __be16 [usertype] <noident> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 883706d commit 2ed81e6

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/staging/rtl8712/rtl871x_xmit.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,8 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
339339
/* if in MP_STATE, update pkt_attrib from mp_txcmd, and overwrite
340340
* some settings above.*/
341341
if (check_fwstate(pmlmepriv, WIFI_MP_STATE))
342-
pattrib->priority = (txdesc.txdw1 >> QSEL_SHT) & 0x1f;
342+
pattrib->priority =
343+
(le32_to_cpu(txdesc.txdw1) >> QSEL_SHT) & 0x1f;
343344
return _SUCCESS;
344345
}
345346

@@ -479,7 +480,7 @@ static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr,
479480
struct ieee80211_hdr *pwlanhdr = (struct ieee80211_hdr *)hdr;
480481
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
481482
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
482-
u16 *fctrl = &pwlanhdr->frame_ctl;
483+
__le16 *fctrl = &pwlanhdr->frame_ctl;
483484

484485
memset(hdr, 0, WLANHDR_OFFSET);
485486
SetFrameSubType(fctrl, pattrib->subtype);
@@ -568,7 +569,7 @@ static sint r8712_put_snap(u8 *data, u16 h_proto)
568569
snap->oui[0] = oui[0];
569570
snap->oui[1] = oui[1];
570571
snap->oui[2] = oui[2];
571-
*(u16 *)(data + SNAP_SIZE) = htons(h_proto);
572+
*(__be16 *)(data + SNAP_SIZE) = htons(h_proto);
572573
return SNAP_SIZE + sizeof(u16);
573574
}
574575

0 commit comments

Comments
 (0)