Commit 2d5f72b0 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: rtl8188eu: clean up comparsion style issues

Move constants to the right side of comparsions to follow kernel
coding style and clear checkpatch warnings. In case of comparsion
to _FAIL we can use '!' since _FAIL is defined as '0'.

WARNING: Comparisons should place the constant on the right side of the test
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200917071330.31740-2-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a620afdb
...@@ -2981,7 +2981,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, ...@@ -2981,7 +2981,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
status = _STATS_FAILURE_; status = _STATS_FAILURE_;
} }
if (_STATS_SUCCESSFUL_ != status) if (status != _STATS_SUCCESSFUL_)
goto OnAssocReqFail; goto OnAssocReqFail;
/* check if the supported rate is ok */ /* check if the supported rate is ok */
...@@ -3072,7 +3072,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, ...@@ -3072,7 +3072,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
wpa_ie_len = 0; wpa_ie_len = 0;
} }
if (_STATS_SUCCESSFUL_ != status) if (status != _STATS_SUCCESSFUL_)
goto OnAssocReqFail; goto OnAssocReqFail;
pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS); pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
...@@ -3282,7 +3282,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, ...@@ -3282,7 +3282,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
spin_unlock_bh(&pstapriv->asoc_list_lock); spin_unlock_bh(&pstapriv->asoc_list_lock);
/* now the station is qualified to join our BSS... */ /* now the station is qualified to join our BSS... */
if ((pstat->state & WIFI_FW_ASSOC_SUCCESS) && (_STATS_SUCCESSFUL_ == status)) { if ((pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status == _STATS_SUCCESSFUL_)) {
/* 1 bss_cap_update & sta_info_update */ /* 1 bss_cap_update & sta_info_update */
bss_cap_update_on_sta_join(padapter, pstat); bss_cap_update_on_sta_join(padapter, pstat);
sta_info_update(padapter, pstat); sta_info_update(padapter, pstat);
......
...@@ -829,9 +829,9 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate ...@@ -829,9 +829,9 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate
} }
/* Decide RATRState by RSSI. */ /* Decide RATRState by RSSI. */
if (RSSI > HighRSSIThreshForRA) if (HighRSSIThreshForRA < RSSI)
RATRState = DM_RATR_STA_HIGH; RATRState = DM_RATR_STA_HIGH;
else if (RSSI > LowRSSIThreshForRA) else if (LowRSSIThreshForRA < RSSI)
RATRState = DM_RATR_STA_MIDDLE; RATRState = DM_RATR_STA_MIDDLE;
else else
RATRState = DM_RATR_STA_LOW; RATRState = DM_RATR_STA_LOW;
......
...@@ -187,7 +187,7 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data) ...@@ -187,7 +187,7 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)
/* polling */ /* polling */
do { do {
value = usb_read32(padapter, LLTReg); value = usb_read32(padapter, LLTReg);
if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value)) if (_LLT_OP_VALUE(value) == _LLT_NO_ACTIVE)
break; break;
if (count > POLLING_LLT_THRESHOLD) { if (count > POLLING_LLT_THRESHOLD) {
......
...@@ -266,7 +266,7 @@ static inline void set_fwstate(struct mlme_priv *pmlmepriv, int state) ...@@ -266,7 +266,7 @@ static inline void set_fwstate(struct mlme_priv *pmlmepriv, int state)
{ {
pmlmepriv->fw_state |= state; pmlmepriv->fw_state |= state;
/* FOR HW integration */ /* FOR HW integration */
if (_FW_UNDER_SURVEY == state) if (state == _FW_UNDER_SURVEY)
pmlmepriv->bScanInProcess = true; pmlmepriv->bScanInProcess = true;
} }
...@@ -274,7 +274,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state) ...@@ -274,7 +274,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state)
{ {
pmlmepriv->fw_state &= ~state; pmlmepriv->fw_state &= ~state;
/* FOR HW integration */ /* FOR HW integration */
if (_FW_UNDER_SURVEY == state) if (state == _FW_UNDER_SURVEY)
pmlmepriv->bScanInProcess = false; pmlmepriv->bScanInProcess = false;
} }
......
...@@ -326,7 +326,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) ...@@ -326,7 +326,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
static inline int IsFrameTypeCtrl(unsigned char *pframe) static inline int IsFrameTypeCtrl(unsigned char *pframe)
{ {
if (WIFI_CTRL_TYPE == GetFrameType(pframe)) if (GetFrameType(pframe) == WIFI_CTRL_TYPE)
return true; return true;
else else
return false; return false;
......
...@@ -694,7 +694,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, ...@@ -694,7 +694,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
enum ndis_802_11_network_infra networkType; enum ndis_802_11_network_infra networkType;
int ret = 0; int ret = 0;
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (!rtw_pwr_wakeup(padapter)) {
ret = -EPERM; ret = -EPERM;
goto exit; goto exit;
} }
...@@ -946,7 +946,7 @@ static int rtw_wx_set_wap(struct net_device *dev, ...@@ -946,7 +946,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
enum ndis_802_11_auth_mode authmode; enum ndis_802_11_auth_mode authmode;
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (!rtw_pwr_wakeup(padapter)) {
ret = -1; ret = -1;
goto exit; goto exit;
} }
...@@ -1065,7 +1065,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -1065,7 +1065,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s\n", __func__)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s\n", __func__));
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (!rtw_pwr_wakeup(padapter)) {
ret = -1; ret = -1;
goto exit; goto exit;
} }
...@@ -1269,7 +1269,7 @@ static int rtw_wx_set_essid(struct net_device *dev, ...@@ -1269,7 +1269,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_,
("+%s: fw_state = 0x%08x\n", __func__, get_fwstate(pmlmepriv))); ("+%s: fw_state = 0x%08x\n", __func__, get_fwstate(pmlmepriv)));
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (!rtw_pwr_wakeup(padapter)) {
ret = -1; ret = -1;
goto exit; goto exit;
} }
...@@ -2878,7 +2878,7 @@ static int rtw_wx_set_priv(struct net_device *dev, ...@@ -2878,7 +2878,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
int probereq_wpsie_len = len; int probereq_wpsie_len = len;
u8 wps_oui[4] = {0x0, 0x50, 0xf2, 0x04}; u8 wps_oui[4] = {0x0, 0x50, 0xf2, 0x04};
if ((_VENDOR_SPECIFIC_IE_ == probereq_wpsie[0]) && if ((probereq_wpsie[0] == _VENDOR_SPECIFIC_IE_) &&
(!memcmp(&probereq_wpsie[2], wps_oui, 4))) { (!memcmp(&probereq_wpsie[2], wps_oui, 4))) {
cp_sz = min(probereq_wpsie_len, MAX_WPS_IE_LEN); cp_sz = min(probereq_wpsie_len, MAX_WPS_IE_LEN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment