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

staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c

Sparse displays the following:

CHECK drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: got restricted __le16 *<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
ac049e30 c4af455f

+21 -20
+21 -20
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
··· 1852 1852 struct pkt_attrib *pattrib; 1853 1853 unsigned char *pframe; 1854 1854 struct rtw_ieee80211_hdr *pwlanhdr; 1855 - unsigned short *fctrl; 1855 + __le16 *fctrl; 1856 1856 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 1857 1857 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 1858 1858 struct wifidirect_info *pwdinfo = &(padapter->wdinfo); ··· 2199 2199 struct pkt_attrib *pattrib; 2200 2200 unsigned char *pframe; 2201 2201 struct rtw_ieee80211_hdr *pwlanhdr; 2202 - unsigned short *fctrl; 2202 + __le16 *fctrl; 2203 2203 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 2204 2204 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 2205 2205 struct wifidirect_info *pwdinfo = &(padapter->wdinfo); ··· 2561 2561 struct pkt_attrib *pattrib; 2562 2562 unsigned char *pframe; 2563 2563 struct rtw_ieee80211_hdr *pwlanhdr; 2564 - unsigned short *fctrl; 2564 + __le16 *fctrl; 2565 2565 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 2566 2566 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 2567 2567 struct wifidirect_info *pwdinfo = &(padapter->wdinfo); ··· 2729 2729 struct pkt_attrib *pattrib; 2730 2730 unsigned char *pframe; 2731 2731 struct rtw_ieee80211_hdr *pwlanhdr; 2732 - unsigned short *fctrl; 2732 + __le16 *fctrl; 2733 2733 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 2734 2734 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 2735 2735 struct wifidirect_info *pwdinfo = &(padapter->wdinfo); ··· 2981 2981 struct pkt_attrib *pattrib; 2982 2982 unsigned char *pframe; 2983 2983 struct rtw_ieee80211_hdr *pwlanhdr; 2984 - unsigned short *fctrl; 2984 + __le16 *fctrl; 2985 2985 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 2986 2986 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 2987 2987 struct wifidirect_info *pwdinfo = &(padapter->wdinfo); ··· 3175 3175 struct pkt_attrib *pattrib; 3176 3176 unsigned char *pframe; 3177 3177 struct rtw_ieee80211_hdr *pwlanhdr; 3178 - unsigned short *fctrl; 3178 + __le16 *fctrl; 3179 3179 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 3180 3180 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 3181 3181 struct wifidirect_info *pwdinfo = &(padapter->wdinfo); ··· 3283 3283 struct pkt_attrib *pattrib; 3284 3284 unsigned char *pframe; 3285 3285 struct rtw_ieee80211_hdr *pwlanhdr; 3286 - unsigned short *fctrl; 3286 + __le16 *fctrl; 3287 3287 unsigned char *mac; 3288 3288 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 3289 3289 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); ··· 3534 3534 struct pkt_attrib *pattrib; 3535 3535 unsigned char *pframe; 3536 3536 struct rtw_ieee80211_hdr *pwlanhdr; 3537 - unsigned short *fctrl; 3537 + __le16 *fctrl; 3538 3538 unsigned char *mac; 3539 3539 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 3540 3540 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); ··· 4484 4484 struct pkt_attrib *pattrib; 4485 4485 unsigned char *pframe; 4486 4486 struct rtw_ieee80211_hdr *pwlanhdr; 4487 - unsigned short *fctrl; 4487 + __le16 *fctrl; 4488 4488 unsigned int rate_len; 4489 4489 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 4490 4490 #if defined(CONFIG_88EU_AP_MODE) ··· 4713 4713 struct pkt_attrib *pattrib; 4714 4714 unsigned char *pframe; 4715 4715 struct rtw_ieee80211_hdr *pwlanhdr; 4716 - unsigned short *fctrl; 4716 + __le16 *fctrl; 4717 4717 unsigned char *mac, *bssid; 4718 4718 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 4719 4719 #if defined (CONFIG_88EU_AP_MODE) ··· 4876 4876 struct pkt_attrib *pattrib; 4877 4877 unsigned char *pframe; 4878 4878 struct rtw_ieee80211_hdr *pwlanhdr; 4879 - unsigned short *fctrl; 4879 + __le16 *fctrl; 4880 4880 unsigned char *mac; 4881 4881 unsigned char bssrate[NumRates]; 4882 4882 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); ··· 5013 5013 struct pkt_attrib *pattrib; 5014 5014 unsigned char *pframe; 5015 5015 struct rtw_ieee80211_hdr *pwlanhdr; 5016 - unsigned short *fctrl; 5016 + __le16 *fctrl; 5017 5017 unsigned int val32; 5018 5018 u16 val16; 5019 5019 #ifdef CONFIG_88EU_AP_MODE ··· 5153 5153 struct pkt_attrib *pattrib; 5154 5154 unsigned char *pbuf, *pframe; 5155 5155 unsigned short val; 5156 - unsigned short *fctrl; 5156 + __le16 *fctrl; 5157 5157 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 5158 5158 struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); 5159 5159 struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; ··· 5290 5290 struct pkt_attrib *pattrib; 5291 5291 unsigned char *pframe, *p; 5292 5292 struct rtw_ieee80211_hdr *pwlanhdr; 5293 - unsigned short *fctrl; 5293 + __le16 *fctrl; 5294 5294 __le16 le_tmp; 5295 5295 unsigned int i, j, ie_len, index = 0; 5296 5296 unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates]; ··· 5625 5625 struct pkt_attrib *pattrib; 5626 5626 unsigned char *pframe; 5627 5627 struct rtw_ieee80211_hdr *pwlanhdr; 5628 - unsigned short *fctrl; 5628 + __le16 *fctrl; 5629 5629 struct xmit_priv *pxmitpriv; 5630 5630 struct mlme_ext_priv *pmlmeext; 5631 5631 struct mlme_ext_info *pmlmeinfo; ··· 5740 5740 struct pkt_attrib *pattrib; 5741 5741 unsigned char *pframe; 5742 5742 struct rtw_ieee80211_hdr *pwlanhdr; 5743 - unsigned short *fctrl, *qc; 5743 + __le16 *fctrl; 5744 + unsigned short *qc; 5744 5745 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 5745 5746 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 5746 5747 struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); ··· 5861 5860 struct pkt_attrib *pattrib; 5862 5861 unsigned char *pframe; 5863 5862 struct rtw_ieee80211_hdr *pwlanhdr; 5864 - unsigned short *fctrl; 5863 + __le16 *fctrl; 5865 5864 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 5866 5865 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 5867 5866 struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); ··· 5973 5972 struct pkt_attrib *pattrib; 5974 5973 unsigned char *pframe; 5975 5974 struct rtw_ieee80211_hdr *pwlanhdr; 5976 - unsigned short *fctrl; 5975 + __le16 *fctrl; 5977 5976 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 5978 5977 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 5979 5978 ··· 6041 6040 struct pkt_attrib *pattrib; 6042 6041 u8 *pframe; 6043 6042 struct rtw_ieee80211_hdr *pwlanhdr; 6044 - u16 *fctrl; 6043 + __le16 *fctrl; 6045 6044 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 6046 6045 struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 6047 6046 struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); ··· 6163 6162 struct pkt_attrib *pattrib; 6164 6163 unsigned char *pframe; 6165 6164 struct rtw_ieee80211_hdr *pwlanhdr; 6166 - unsigned short *fctrl; 6165 + __le16 *fctrl; 6167 6166 struct wlan_network *pnetwork = NULL; 6168 6167 struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); 6169 6168 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;