Commit f7722760 authored Feb 10, 2017 by Larry Finger Committed by Greg Kroah-Hartman Nov 08, 2017

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>

parent ed7d79ee

drivers/staging/rtl8712/rtl871x_xmit.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -340,7 +340,8 @@ sint r8712_update_attrib(struct _adapter padapter, _pkt pkt,
		/* if in MP_STATE, update pkt_attrib from mp_txcmd, and overwrite
		* some settings above.*/
		if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
		pattrib->priority = (txdesc.txdw1 >> QSEL_SHT) & 0x1f;
		pattrib->priority =
		(le32_to_cpu(txdesc.txdw1) >> QSEL_SHT) & 0x1f;
		return _SUCCESS;
		}

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

		memset(hdr, 0, WLANHDR_OFFSET);
		SetFrameSubType(fctrl, pattrib->subtype);
		@@ -569,7 +570,7 @@ static sint r8712_put_snap(u8 *data, u16 h_proto)
		snap->oui[0] = oui[0];
		snap->oui[1] = oui[1];
		snap->oui[2] = oui[2];
		(u16 )(data + SNAP_SIZE) = htons(h_proto);
		(__be16 )(data + SNAP_SIZE) = htons(h_proto);
		return SNAP_SIZE + sizeof(u16);
		}