Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: r8712u: Fix Sparse warning in rtl871x_xmit.c

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>

authored by

Larry Finger and committed by
Greg Kroah-Hartman
07222e53 dc223652

+4 -3
+4 -3
drivers/staging/rtl8712/rtl871x_xmit.c
··· 347 347 * some settings above. 348 348 */ 349 349 if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) 350 - pattrib->priority = (txdesc.txdw1 >> QSEL_SHT) & 0x1f; 350 + pattrib->priority = 351 + (le32_to_cpu(txdesc.txdw1) >> QSEL_SHT) & 0x1f; 351 352 return _SUCCESS; 352 353 } 353 354 ··· 489 488 struct ieee80211_hdr *pwlanhdr = (struct ieee80211_hdr *)hdr; 490 489 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 491 490 struct qos_priv *pqospriv = &pmlmepriv->qospriv; 492 - u16 *fctrl = &pwlanhdr->frame_ctl; 491 + __le16 *fctrl = &pwlanhdr->frame_ctl; 493 492 494 493 memset(hdr, 0, WLANHDR_OFFSET); 495 494 SetFrameSubType(fctrl, pattrib->subtype); ··· 578 577 snap->oui[0] = oui[0]; 579 578 snap->oui[1] = oui[1]; 580 579 snap->oui[2] = oui[2]; 581 - *(u16 *)(data + SNAP_SIZE) = htons(h_proto); 580 + *(__be16 *)(data + SNAP_SIZE) = htons(h_proto); 582 581 return SNAP_SIZE + sizeof(u16); 583 582 } 584 583