Skip to content

Commit

Permalink
rtl8192du: Fix Sparse warnings/errors
Browse files Browse the repository at this point in the history 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
@lwfinger
lwfinger committed Nov 15, 2014
1 parent e0dc795 commit b566c98
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 98 deletions.
2 changes: 1 addition & 1 deletion core/rtw_mlme.c
View file
Expand Up @@ -1139,11 +1139,11 @@ void rtw_free_assoc_resources(struct rtw_adapter *adapter,
(adapter->stapriv.asoc_sta_count == 1)))
rtw_free_network_nolock(pmlmepriv, pwlan);

/* Sparse warning ifor context imbalance is OK here */
if (lock_scanned_queue)
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));

pmlmepriv->key_mask = 0;

}

/*
Expand Down
31 changes: 16 additions & 15 deletions core/rtw_mlme_ext.c
View file
Expand Up @@ -2481,7 +2481,7 @@ void issue_beacon(struct rtw_adapter *adapt)
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
unsigned int rate_len;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);
Expand Down Expand Up @@ -2656,7 +2656,7 @@ void issue_probersp(struct rtw_adapter *adapt, unsigned char *da,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
unsigned char *mac, *bssid;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
#if defined (CONFIG_92D_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
Expand Down Expand Up @@ -2881,7 +2881,7 @@ static int _issue_probereq(struct rtw_adapter *adapt,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
unsigned char *mac;
unsigned char bssrate[NUMRATES];
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
Expand Down Expand Up @@ -3041,7 +3041,7 @@ void issue_auth(struct rtw_adapter *adapt, struct sta_info *psta,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
unsigned int val32;
unsigned short val16;
int use_shared_key = 0;
Expand Down Expand Up @@ -3210,7 +3210,7 @@ void issue_asocrsp(struct rtw_adapter *adapt, unsigned short status,
struct pkt_attrib *pattrib;
unsigned char *pbuf, *pframe;
unsigned short val;
unsigned short *fctrl;
__le16 *fctrl;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);
struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv;
Expand Down Expand Up @@ -3367,7 +3367,7 @@ void issue_assocreq(struct rtw_adapter *adapt)
struct pkt_attrib *pattrib;
unsigned char *pframe, *p;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
unsigned short val16;
__le16 le_tmp;
unsigned int i, j, ie_len, index = 0;
Expand Down Expand Up @@ -3685,7 +3685,7 @@ static int _issue_nulldata(struct rtw_adapter *adapt, unsigned char *da,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
struct xmit_priv *pxmitpriv;
struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo;
Expand Down Expand Up @@ -3815,7 +3815,8 @@ static int _issue_qos_nulldata(struct rtw_adapter *adapt, unsigned char *da,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl, *qc;
__le16 *fctrl;
u16 *qc;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
Expand Down Expand Up @@ -3948,7 +3949,7 @@ static int _issue_deauth(struct rtw_adapter *adapt, unsigned char *da,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
Expand Down Expand Up @@ -4064,7 +4065,7 @@ void issue_action_spct_ch_switch(struct rtw_adapter *adapt, u8 *ra,
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
Expand Down Expand Up @@ -4136,7 +4137,7 @@ void issue_action_BA(struct rtw_adapter *adapt, unsigned char *raddr,
struct pkt_attrib *pattrib;
u8 *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl;
__le16 *fctrl;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
Expand Down Expand Up @@ -4240,9 +4241,9 @@ void issue_action_BA(struct rtw_adapter *adapt, unsigned char *raddr,
(unsigned char *)(&status),
&(pattrib->pktlen));

le_tmp = cpu_to_le16((pmlmeinfo->ADDBA_req.BA_para_set &
0x3f) | 0x1000);/*64 buffer size*/
BA_para_set = le16_to_cpu(le_tmp);
BA_para_set =
(le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) &
0x3f) | 0x1000;/*64 buffer size*/

if (pregpriv->ampdu_amsdu == 0) /* disabled */
le_tmp = cpu_to_le16(BA_para_set & ~BIT(0));
Expand Down Expand Up @@ -4288,7 +4289,7 @@ static void issue_action_BSSCoexistPacket(struct rtw_adapter *adapt)
struct pkt_attrib *pattrib;
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
__le16 *fctrl;
struct wlan_network *pnetwork = NULL;
struct xmit_priv *pxmitpriv = &(adapt->xmitpriv);
struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
Expand Down
2 changes: 1 addition & 1 deletion core/rtw_xmit.c
View file
Expand Up @@ -809,7 +809,7 @@ s32 rtw_make_wlanhdr (struct rtw_adapter *padapter , u8 *hdr, struct pkt_attrib
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
u8 qos_option = false;
int res = _SUCCESS;
u16 *fctrl = &pwlanhdr->frame_ctl;
__le16 *fctrl = &pwlanhdr->frame_ctl;
struct sta_info *psta;
int bmcst = IS_MCAST(pattrib->ra);

Expand Down
16 changes: 8 additions & 8 deletions hal/rtl8192d_cmd.c
View file
Expand Up @@ -348,8 +348,8 @@ void rtl8192d_set_FwPwrMode_cmd(struct rtw_adapter*padapter, u8 Mode)
static void ConstructBeacon(struct rtw_adapter *padapter, u8 *pframe, u32 *pLength)
{
struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl;
u32 rate_len, pktlen;
__le16 *fctrl;
u32 rate_len, pktlen;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
Expand Down Expand Up @@ -441,7 +441,7 @@ static void ConstructBeacon(struct rtw_adapter *padapter, u8 *pframe, u32 *pLeng
static void ConstructPSPoll(struct rtw_adapter *padapter, u8 *pframe, u32 *pLength)
{
struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl;
__le16 *fctrl;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

Expand All @@ -468,8 +468,8 @@ static void ConstructPSPoll(struct rtw_adapter *padapter, u8 *pframe, u32 *pLeng
static void ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, bool bForcePowerSave)
{
struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl;
u32 pktlen;
__le16 *fctrl;
u32 pktlen;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *cur_network = &pmlmepriv->cur_network;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
Expand Down Expand Up @@ -519,9 +519,9 @@ static void ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe,
static void ConstructProbeRsp(struct rtw_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, bool bHideSSID)
{
struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl;
u8 *mac, *bssid;
u32 pktlen;
__le16 *fctrl;
u8 *mac, *bssid;
u32 pktlen;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
Expand Down
28 changes: 14 additions & 14 deletions include/ieee80211.h
View file
Expand Up @@ -298,44 +298,44 @@ struct ieee_ibss_seq {
};

struct rtw_ieee80211_hdr {
u16 frame_ctl;
u16 duration_id;
__le16 frame_ctl;
__le16 duration_id;
u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN];
u16 seq_ctl;
__le16 seq_ctl;
u8 addr4[ETH_ALEN];
} __attribute__ ((packed));

struct rtw_ieee80211_hdr_3addr {
u16 frame_ctl;
u16 duration_id;
__le16 frame_ctl;
__le16 duration_id;
u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN];
u16 seq_ctl;
__le16 seq_ctl;
} __attribute__ ((packed));


struct rtw_ieee80211_hdr_qos {
u16 frame_ctl;
u16 duration_id;
__le16 frame_ctl;
__le16 duration_id;
u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN];
u16 seq_ctl;
__le16 seq_ctl;
u8 addr4[ETH_ALEN];
u16 qc;
__le16 qc;
} __attribute__ ((packed));

struct rtw_ieee80211_hdr_3addr_qos {
u16 frame_ctl;
u16 duration_id;
__le16 frame_ctl;
__le16 duration_id;
u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN];
u16 seq_ctl;
u16 qc;
__le16 seq_ctl;
__le16 qc;
} __attribute__ ((packed));

struct eapol {
Expand Down
41 changes: 17 additions & 24 deletions include/wifi.h
View file
Expand Up @@ -677,57 +677,50 @@ struct rtw_ieee80211_ht_cap {
*/
struct ieee80211_ht_addt_info {
unsigned char control_chan;
unsigned char ht_param;
unsigned char ht_param;
unsigned short operation_mode;
unsigned short stbc_param;
unsigned char basic_set[16];
unsigned char basic_set[16];
} __attribute__ ((packed));


struct HT_caps_element
{
union
{
struct
{
struct HT_caps_element {
union {
struct {
__le16 HT_caps_info;
unsigned char AMPDU_para;
unsigned char MCS_rate[16];
unsigned short HT_ext_caps;
unsigned int Beamforming_caps;
__le16 HT_ext_caps;
__le32 Beamforming_caps;
unsigned char ASEL_caps;
} HT_cap_element;
unsigned char HT_cap[26];
}u;
} __attribute__ ((packed));

struct HT_info_element
{
struct HT_info_element {
unsigned char primary_channel;
unsigned char infos[5];
unsigned char MCS_rate[16];
} __attribute__ ((packed));

struct AC_param
{
unsigned char ACI_AIFSN;
unsigned char CW;
unsigned short TXOP_limit;
struct AC_param {
unsigned char ACI_AIFSN;
unsigned char CW;
__le16 TXOP_limit;
} __attribute__ ((packed));

struct WMM_para_element
{
struct WMM_para_element {
unsigned char QoS_info;
unsigned char reserved;
struct AC_param ac_param[4];
} __attribute__ ((packed));

struct ADDBA_request
{
struct ADDBA_request {
unsigned char dialog_token;
unsigned short BA_para_set;
unsigned short BA_timeout_value;
unsigned short BA_starting_seqctrl;
__le16 BA_para_set;
__le16 BA_timeout_value;
__le16 BA_starting_seqctrl;
} __attribute__ ((packed));


Expand Down

0 comments on commit b566c98

Please sign in to comment.