Convert logical tests with styles like: "if (test == true)" to "if (test)" "if (test == false)" to "if (!test)" etc. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> --- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 6 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 2 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 28 ++-- drivers/staging/ath6kl/os/linux/ar6000_pm.c | 2 +- drivers/staging/ath6kl/os/linux/ar6k_pal.c | 4 +- drivers/staging/ath6kl/os/linux/cfg80211.c | 34 ++-- drivers/staging/ath6kl/os/linux/ioctl.c | 244 ++++++++++---------- drivers/staging/ath6kl/os/linux/wireless_ext.c | 56 +++--- drivers/staging/ath6kl/wmi/wmi.c | 16 +- 9 files changed, 196 insertions(+), 196 deletions(-) diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c index a6a0695..8635ac8 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c @@ -118,7 +118,7 @@ int AthPSInitialize(AR3K_CONFIG_INFO *hdev) remove_wait_queue(&PsCompleteEvent,&wait); return A_ERROR; } - wait_event_interruptible(PsCompleteEvent,(PSTagMode == false)); + wait_event_interruptible(PsCompleteEvent,(!PSTagMode)); set_current_state(TASK_RUNNING); remove_wait_queue(&PsCompleteEvent,&wait); @@ -326,7 +326,7 @@ int PSSendOps(void *arg) } } #ifdef HCI_TRANSPORT_SDIO - if (BDADDR == false) + if (!BDADDR) if (hdev->bdaddr[0] !=0x00 || hdev->bdaddr[1] !=0x00 || hdev->bdaddr[2] !=0x00 || @@ -405,7 +405,7 @@ int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, return A_ERROR; } //add_timer(&psCmdTimer); - wait_event_interruptible(HciEvent,(PSAcked == true)); + wait_event_interruptible(HciEvent,(PSAcked)); if (NULL != HciEventpacket) { *ppEventBuffer = HciEventpacket; *ppBufferToFree = HciEventpacket; diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c index 83e68cf..a96259c 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c @@ -302,7 +302,7 @@ unsigned int uReadDataInSection(char *pCharLine, ST_PS_DATA_FORMAT stPS_DataForm } if (stPS_DataFormat.eDataType == eHex) { - if (stPS_DataFormat.bIsArray == true) { + if (stPS_DataFormat.bIsArray) { //Not implemented return (0x0FFF); } diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index 958b85e..844b544 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -755,7 +755,7 @@ aptcTimerHandler(unsigned long arg) throughput = ((numbytes * 8)/APTC_TRAFFIC_SAMPLING_INTERVAL); /* Kbps */ if (throughput < APTC_LOWER_THROUGHPUT_THRESHOLD) { /* Enable Sleep and delete the timer */ - A_ASSERT(ar->arWmiReady == true); + A_ASSERT(ar->arWmiReady); AR6000_SPIN_UNLOCK(&ar->arLock, 0); status = wmi_powermode_cmd(ar->arWmi, REC_POWER); AR6000_SPIN_LOCK(&ar->arLock, 0); @@ -1936,7 +1936,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs) netif_stop_queue(dev); /* Disable the target and the interrupts associated with it */ - if (ar->arWmiReady == true) + if (ar->arWmiReady) { if (!bypasswmi) { @@ -1993,7 +1993,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs) __func__, (unsigned long) ar, (unsigned long) ar->arWmi)); /* Shut down WMI if we have started it */ - if (ar->arWmiEnabled == true) + if (ar->arWmiEnabled) { AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("%s(): Shut down WMI\n", __func__)); wmi_shutdown(ar->arWmi); @@ -2327,7 +2327,7 @@ ar6000_close(struct net_device *dev) AR6000_SPIN_UNLOCK(&ar->arLock, 0); } - if (ar->arWmiReady == true) { + if (ar->arWmiReady) { if (wmi_scanparams_cmd(ar->arWmi, 0xFFFF, 0, 0, 0, 0, 0, 0, 0, 0, 0) != 0) { return -EIO; @@ -2667,7 +2667,7 @@ int ar6000_init(struct net_device *dev) status = HTCStart(ar->arHtcTarget); if (status) { - if (ar->arWmiEnabled == true) { + if (ar->arWmiEnabled) { wmi_shutdown(ar->arWmi); ar->arWmiEnabled = false; ar->arWmi = NULL; @@ -2680,7 +2680,7 @@ int ar6000_init(struct net_device *dev) if (!bypasswmi) { /* Wait for Wmi event to be ready */ timeleft = wait_event_interruptible_timeout(arEvent, - (ar->arWmiReady == true), wmitimeout * HZ); + (ar->arWmiReady), wmitimeout * HZ); if (ar->arVersion.abi_ver != AR6K_ABI_VERSION) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ABI Version mismatch: Host(0x%x), Target(0x%x)\n", AR6K_ABI_VERSION, ar->arVersion.abi_ver)); @@ -2950,7 +2950,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) if (qMcast) { /* If this transmit is not because of a Dtim Expiry q it */ - if (ar->DTIMExpired == false) { + if (!ar->DTIMExpired) { bool isMcastqEmpty = false; A_MUTEX_LOCK(&ar->mcastpsqLock); @@ -3286,7 +3286,7 @@ applyAPTCHeuristics(AR_SOFTC_T *ar) throughput = ((numbytes * 8) / duration); if (throughput > APTC_UPPER_THROUGHPUT_THRESHOLD) { /* Disable Sleep and schedule a timer */ - A_ASSERT(ar->arWmiReady == true); + A_ASSERT(ar->arWmiReady); AR6000_SPIN_UNLOCK(&ar->arLock, 0); status = wmi_powermode_cmd(ar->arWmi, MAX_PERF_POWER); AR6000_SPIN_LOCK(&ar->arLock, 0); @@ -3508,7 +3508,7 @@ ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPacketQueue) A_NETBUF_FREE(pktSkb); } - if ((ar->arConnected == true) || bypasswmi) { + if (ar->arConnected || bypasswmi) { if (!flushing) { /* don't wake the queue if we are flushing, other wise it will just * keep queueing packets, which will keep failing */ @@ -3615,7 +3615,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) if (status) { AR6000_STAT_INC(ar, rx_errors); A_NETBUF_FREE(skb); - } else if (ar->arWmiEnabled == true) { + } else if (ar->arWmiEnabled) { if (ept == ar->arControlEp) { /* * this is a wmi control msg @@ -3801,7 +3801,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket) *((short *)A_NETBUF_DATA(skb)) = WMI_ACL_DATA_EVENTID; /* send the data packet to PAL driver */ if (ar6k_pal_config_g.fpar6k_pal_recv_pkt) { - if ((*ar6k_pal_config_g.fpar6k_pal_recv_pkt)(ar->hcipal_info, skb) == true) + if ((*ar6k_pal_config_g.fpar6k_pal_recv_pkt)(ar->hcipal_info, skb)) goto rx_done; } } @@ -4779,7 +4779,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd) if (ar6k_pal_config_g.fpar6k_pal_recv_pkt) { /* pass the cmd packet to PAL driver */ - if ((*ar6k_pal_config_g.fpar6k_pal_recv_pkt)(ar->hcipal_info, osbuf) == true) + if ((*ar6k_pal_config_g.fpar6k_pal_recv_pkt)(ar->hcipal_info, osbuf)) return; } ar6000_deliver_frames_to_nw_stack(ar->arNetDev, osbuf); @@ -5759,7 +5759,7 @@ void ar6000_dtimexpiry_event(AR_SOFTC_T *ar) isMcastQueued = A_NETBUF_QUEUE_EMPTY(&ar->mcastpsq); A_MUTEX_UNLOCK(&ar->mcastpsqLock); - A_ASSERT(isMcastQueued == false); + A_ASSERT(!isMcastQueued); /* Flush the mcast psq to the target */ /* Set the STA flag to DTIMExpired, so that the frame will go out */ @@ -6098,7 +6098,7 @@ ar6000_connect_to_ap(struct ar6_softc *ar) /* The ssid length check prevents second "essid off" from the user, to be treated as a connect cmd. The second "essid off" is ignored. */ - if ((ar->arWmiReady == true) && (ar->arSsidLen > 0) && ar->arNetworkType!=AP_NETWORK) + if ((ar->arWmiReady) && (ar->arSsidLen > 0) && ar->arNetworkType!=AP_NETWORK) { int status; if ((ADHOC_NETWORK != ar->arNetworkType) && diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c index 08b451f..01ac6a1e 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c @@ -376,7 +376,7 @@ ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) #ifdef ANDROID_ENV /* Wait for WMI ready event */ u32 timeleft = wait_event_interruptible_timeout(arEvent, - (ar->arWmiReady == true), wmitimeout * HZ); + (ar->arWmiReady), wmitimeout * HZ); if (!timeleft || signal_pending(current)) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000 : Failed to get wmi ready \n")); status = A_ERROR; diff --git a/drivers/staging/ath6kl/os/linux/ar6k_pal.c b/drivers/staging/ath6kl/os/linux/ar6k_pal.c index 9d95ba1..943520d 100644 --- a/drivers/staging/ath6kl/os/linux/ar6k_pal.c +++ b/drivers/staging/ath6kl/os/linux/ar6k_pal.c @@ -178,7 +178,7 @@ static int btpal_send_frame(struct sk_buff *skb) { PRIN_LOG("HCI command"); - if (ar->arWmiReady == false) + if (!ar->arWmiReady) { PRIN_LOG("WMI not ready "); break; @@ -195,7 +195,7 @@ static int btpal_send_frame(struct sk_buff *skb) void *osbuf; PRIN_LOG("ACL data"); - if (ar->arWmiReady == false) + if (!ar->arWmiReady) { PRIN_LOG("WMI not ready"); break; diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index 844b592..6abc6fb 100644 --- a/drivers/staging/ath6kl/os/linux/cfg80211.c +++ b/drivers/staging/ath6kl/os/linux/cfg80211.c @@ -249,7 +249,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready yet\n", __func__)); return -EIO; } @@ -583,7 +583,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason_code)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -608,7 +608,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, A_MEMZERO(ar->arSsid, sizeof(ar->arSsid)); ar->arSsidLen = 0; - if (ar->arSkipScan == false) { + if (!ar->arSkipScan) { A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid)); } @@ -730,7 +730,7 @@ ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -819,7 +819,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s:\n", __func__)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -907,7 +907,7 @@ ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -946,7 +946,7 @@ ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -986,7 +986,7 @@ ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1030,7 +1030,7 @@ ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1062,7 +1062,7 @@ ar6k_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: changed 0x%x\n", __func__, changed)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1100,7 +1100,7 @@ ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting typ AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type 0x%x, dbm %d\n", __func__, type, dbm)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1135,7 +1135,7 @@ ar6k_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm) AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1145,7 +1145,7 @@ ar6k_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm) return -EIO; } - if ((ar->arConnected == true)) { + if ((ar->arConnected)) { ar->arTxPwr = 0; if (wmi_get_txPwr_cmd(ar->arWmi) != 0) { @@ -1175,7 +1175,7 @@ ar6k_cfg80211_set_power_mgmt(struct wiphy *wiphy, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: pmgmt %d, timeout %d\n", __func__, pmgmt, timeout)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1237,7 +1237,7 @@ ar6k_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type %u\n", __func__, type)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1273,7 +1273,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } @@ -1346,7 +1346,7 @@ ar6k_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev) AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: Wmi not ready\n", __func__)); return -EIO; } diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c index d0f5fb5..19386f8 100644 --- a/drivers/staging/ath6kl/os/linux/ioctl.c +++ b/drivers/staging/ath6kl/os/linux/ioctl.c @@ -41,7 +41,7 @@ ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq) { AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -57,7 +57,7 @@ ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq) { AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -78,7 +78,7 @@ ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata) WMI_SET_ROAM_CTRL_CMD cmd; u8 size = sizeof(cmd); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -111,7 +111,7 @@ ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata) WMI_POWERSAVE_TIMERS_POLICY_CMD cmd; u8 size = sizeof(cmd); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -140,7 +140,7 @@ ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq) if ((dev->flags & IFF_UP) != IFF_UP) { return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -175,7 +175,7 @@ ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq) if ((dev->flags & IFF_UP) != IFF_UP) { return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -216,7 +216,7 @@ ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq) if ((dev->flags & IFF_UP) != IFF_UP) { return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -268,7 +268,7 @@ ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq) if ((dev->flags & IFF_UP) != IFF_UP) { return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -305,7 +305,7 @@ ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq) WMI_POWER_MODE_CMD power_mode; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -325,7 +325,7 @@ ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq) WMI_CHANNEL_PARAMS_CMD cmd, *cmdp; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -386,7 +386,7 @@ ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq) WMI_SNR_THRESHOLD_PARAMS_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -420,7 +420,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq) s32 i, j; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -495,7 +495,7 @@ ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq) WMI_LQ_THRESHOLD_PARAMS_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -518,7 +518,7 @@ ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq) WMI_PROBED_SSID_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -542,7 +542,7 @@ ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq) WMI_ADD_BAD_AP_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -578,7 +578,7 @@ ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq) WMI_CREATE_PSTREAM_CMD cmd; int ret; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -611,7 +611,7 @@ ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq) WMI_DELETE_PSTREAM_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -641,7 +641,7 @@ ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq) struct ar6000_queuereq qreq; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -673,7 +673,7 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev, return -EBUSY; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -746,7 +746,7 @@ ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq) WMI_TARGET_ERROR_REPORT_BITMASK cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -766,7 +766,7 @@ ar6000_clear_target_stats(struct net_device *dev) TARGET_STATS *pStats = &ar->arTargetStats; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } AR6000_SPIN_LOCK(&ar->arLock, 0); @@ -786,7 +786,7 @@ ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq) if (ar->bIsDestroyProgress) { return -EBUSY; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) { @@ -834,7 +834,7 @@ ar6000_ioctl_get_ap_stats(struct net_device *dev, struct ifreq *rq) WMI_AP_MODE_STAT *pStats = &ar->arAPStats; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } if (copy_from_user(&action, (char *)((unsigned int*)rq->ifr_data + 1), @@ -892,7 +892,7 @@ ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq) WMI_SET_ACCESS_PARAMS_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -918,7 +918,7 @@ ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq) WMI_DISC_TIMEOUT_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -943,7 +943,7 @@ ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata) WMI_SET_VOICE_PKT_SIZE_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -969,7 +969,7 @@ ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata) WMI_SET_MAX_SP_LEN_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -995,7 +995,7 @@ ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata) WMI_SET_BT_STATUS_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1020,7 +1020,7 @@ ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata) WMI_SET_BT_PARAMS_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1045,7 +1045,7 @@ ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata) WMI_SET_BTCOEX_FE_ANT_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } if (copy_from_user(&cmd, userdata, sizeof(cmd))) { @@ -1069,7 +1069,7 @@ ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *use WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1094,7 +1094,7 @@ ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, cha WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1119,7 +1119,7 @@ ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char *userdata) WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1145,7 +1145,7 @@ ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev, WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1170,7 +1170,7 @@ ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userd WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1195,7 +1195,7 @@ ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata) WMI_SET_BTCOEX_DEBUG_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1220,7 +1220,7 @@ ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char * WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd; int ret = 0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1251,7 +1251,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata, if (ar->bIsDestroyProgress) { return -EBUSY; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } if (copy_from_user(&btcoexConfig.configCmd, userdata, sizeof(AR6000_BTCOEX_CONFIG))) { @@ -1293,7 +1293,7 @@ ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, stru if (ar->bIsDestroyProgress) { return -EBUSY; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1716,7 +1716,7 @@ ar6000_ioctl_setparam(AR_SOFTC_T *ar, int param, int value) } break; case IEEE80211_PARAM_COUNTERMEASURES: - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } wmi_set_tkip_countermeasures_cmd(ar->arWmi, value); @@ -1724,7 +1724,7 @@ ar6000_ioctl_setparam(AR_SOFTC_T *ar, int param, int value) default: break; } - if ((ar->arNextMode != AP_NETWORK) && (profChanged == true)) { + if ((ar->arNextMode != AP_NETWORK) && (profChanged)) { /* * profile has changed. Erase ssid to signal change */ @@ -1919,7 +1919,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { int param, value; int *ptr = (int *)rq->ifr_ifru.ifru_newname; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else { param = *ptr++; @@ -1931,7 +1931,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case IEEE80211_IOCTL_SETKEY: { struct ieee80211req_key keydata; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&keydata, userdata, sizeof(struct ieee80211req_key))) { @@ -1950,7 +1950,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case IEEE80211_IOCTL_SETMLME: { struct ieee80211req_mlme mlme; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&mlme, userdata, sizeof(struct ieee80211req_mlme))) { @@ -1988,7 +1988,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case IEEE80211_IOCTL_ADDPMKID: { struct ieee80211req_addpmkid req; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&req, userdata, sizeof(struct ieee80211req_addpmkid))) { ret = -EFAULT; @@ -2347,7 +2347,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -2398,7 +2398,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_POWER_MODE_CMD pwrModeCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&pwrModeCmd, userdata, sizeof(pwrModeCmd))) @@ -2417,7 +2417,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_IBSS_PM_CAPS_CMD ibssPmCaps; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&ibssPmCaps, userdata, sizeof(ibssPmCaps))) @@ -2439,7 +2439,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_AP_PS_CMD apPsCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&apPsCmd, userdata, sizeof(apPsCmd))) @@ -2458,7 +2458,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_POWER_PARAMS_CMD pmParams; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&pmParams, userdata, sizeof(pmParams))) @@ -2484,7 +2484,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } case AR6000_IOCTL_WMI_SETSCAN: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&ar->scParams, userdata, sizeof(ar->scParams))) @@ -2517,7 +2517,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_LISTEN_INT_CMD listenCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&listenCmd, userdata, sizeof(listenCmd))) @@ -2540,7 +2540,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_BMISS_TIME_CMD bmissCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&bmissCmd, userdata, sizeof(bmissCmd))) @@ -2557,7 +2557,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_BSS_FILTER_CMD filt; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&filt, userdata, sizeof(filt))) @@ -2586,7 +2586,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } case AR6000_XIOCTL_WMI_CLR_RSSISNR: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } ret = wmi_clr_rssi_snr(ar->arWmi); @@ -2601,7 +2601,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_LPREAMBLE_CMD setLpreambleCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setLpreambleCmd, userdata, sizeof(setLpreambleCmd))) @@ -2625,7 +2625,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WMI_SET_RTS: { WMI_SET_RTS_CMD rtsCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&rtsCmd, userdata, sizeof(rtsCmd))) @@ -2707,7 +2707,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_SET_ASSOC_INFO_CMD cmd; u8 assocInfo[WMI_MAX_ASSOC_INFO_LEN]; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; break; } @@ -2844,7 +2844,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -2881,7 +2881,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -2926,7 +2926,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -2969,7 +2969,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -3019,7 +3019,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -3099,7 +3099,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_ADHOC_BSSID_CMD adhocBssid; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&adhocBssid, userdata, sizeof(adhocBssid))) @@ -3121,7 +3121,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_SET_OPT_MODE_CMD optModeCmd; AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&optModeCmd, userdata, sizeof(optModeCmd))) @@ -3143,7 +3143,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_OPT_TX_FRAME_CMD optTxFrmCmd; u8 data[MAX_OPT_DATA_LEN]; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&optTxFrmCmd, userdata, sizeof(optTxFrmCmd))) @@ -3169,7 +3169,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_RETRY_LIMITS_CMD setRetryParams; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setRetryParams, userdata, sizeof(setRetryParams))) @@ -3194,7 +3194,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_BEACON_INT_CMD bIntvlCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&bIntvlCmd, userdata, sizeof(bIntvlCmd))) @@ -3216,7 +3216,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); struct ieee80211req_authalg req; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&req, userdata, sizeof(struct ieee80211req_authalg))) @@ -3326,7 +3326,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_START_SCAN_CMD setStartScanCmd, *cmdp; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setStartScanCmd, userdata, sizeof(setStartScanCmd))) @@ -3366,7 +3366,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_FIX_RATES_CMD setFixRatesCmd; int returnStatus; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setFixRatesCmd, userdata, sizeof(setFixRatesCmd))) @@ -3395,7 +3395,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret = -EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -3443,7 +3443,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_AUTH_MODE_CMD setAuthMode; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setAuthMode, userdata, sizeof(setAuthMode))) @@ -3461,7 +3461,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_REASSOC_MODE_CMD setReassocMode; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setReassocMode, userdata, sizeof(setReassocMode))) @@ -3509,7 +3509,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WMI_SET_KEEPALIVE: { WMI_SET_KEEPALIVE_CMD setKeepAlive; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } else if (copy_from_user(&setKeepAlive, userdata, @@ -3525,7 +3525,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WMI_SET_PARAMS: { WMI_SET_PARAMS_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } else if (copy_from_user(&cmd, userdata, @@ -3545,7 +3545,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WMI_SET_MCAST_FILTER: { WMI_SET_MCAST_FILTER_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } else if (copy_from_user(&cmd, userdata, @@ -3564,7 +3564,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WMI_DEL_MCAST_FILTER: { WMI_SET_MCAST_FILTER_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } else if (copy_from_user(&cmd, userdata, @@ -3583,7 +3583,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WMI_MCAST_FILTER: { WMI_MCAST_FILTER_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } else if (copy_from_user(&cmd, userdata, @@ -3605,7 +3605,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret =-EBUSY; goto ioctl_done; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -3649,7 +3649,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) u8 appIeInfo[IEEE80211_APPIE_FRAME_MAX_LEN]; u32 fType,ieLen; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } @@ -3715,7 +3715,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { u32 wsc_status; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; goto ioctl_done; } else if (copy_from_user(&wsc_status, userdata, sizeof(u32))) @@ -3804,7 +3804,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_IP_CMD setIP; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setIP, userdata, sizeof(setIP))) @@ -3824,7 +3824,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_HOST_SLEEP_MODE_CMD setHostSleepMode; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setHostSleepMode, userdata, sizeof(setHostSleepMode))) @@ -3843,7 +3843,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_WOW_MODE_CMD setWowMode; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&setWowMode, userdata, sizeof(setWowMode))) @@ -3862,7 +3862,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_GET_WOW_LIST_CMD getWowList; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&getWowList, userdata, sizeof(getWowList))) @@ -3887,7 +3887,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) u8 pattern_data[WOW_PATTERN_SIZE]={0}; do { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; break; } @@ -3925,7 +3925,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_DEL_WOW_PATTERN_CMD delWowPattern; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&delWowPattern, userdata, sizeof(delWowPattern))) @@ -4002,7 +4002,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } break; case AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS: - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&connectCtrlFlags, userdata, sizeof(connectCtrlFlags))) @@ -4013,7 +4013,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } break; case AR6000_XIOCTL_WMI_SET_AKMP_PARAMS: - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&akmpParams, userdata, sizeof(WMI_SET_AKMP_PARAMS_CMD))) @@ -4026,7 +4026,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } break; case AR6000_XIOCTL_WMI_SET_PMKID_LIST: - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else { if (copy_from_user(&pmkidInfo.numPMKID, userdata, @@ -4048,7 +4048,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } break; case AR6000_XIOCTL_WMI_GET_PMKID_LIST: - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else { if (wmi_get_pmkid_list_cmd(ar->arWmi) != 0) { @@ -4057,7 +4057,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } break; case AR6000_XIOCTL_WMI_ABORT_SCAN: - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } ret = wmi_abort_scan_cmd(ar->arWmi); @@ -4065,7 +4065,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_HIDDEN_SSID: { u8 hidden_ssid; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&hidden_ssid, userdata, sizeof(hidden_ssid))) { ret = -EFAULT; @@ -4078,7 +4078,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } case AR6000_XIOCTL_AP_GET_STA_LIST: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else { u8 i; @@ -4101,7 +4101,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_SET_NUM_STA: { u8 num_sta; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&num_sta, userdata, sizeof(num_sta))) { ret = -EFAULT; @@ -4116,7 +4116,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_SET_ACL_POLICY: { u8 policy; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&policy, userdata, sizeof(policy))) { ret = -EFAULT; @@ -4135,7 +4135,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_SET_ACL_MAC: { WMI_AP_ACL_MAC_CMD acl; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&acl, userdata, sizeof(acl))) { ret = -EFAULT; @@ -4151,7 +4151,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } case AR6000_XIOCTL_AP_GET_ACL_LIST: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((WMI_AP_ACL *)rq->ifr_data, &ar->g_acl, sizeof(WMI_AP_ACL))) { @@ -4167,7 +4167,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case IEEE80211_IOCTL_GETWPAIE: { struct ieee80211req_wpaie wpaie; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&wpaie, userdata, sizeof(wpaie))) { ret = -EFAULT; @@ -4181,7 +4181,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_CONN_INACT_TIME: { u32 period; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&period, userdata, sizeof(period))) { ret = -EFAULT; @@ -4193,7 +4193,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_PROT_SCAN_TIME: { WMI_AP_PROT_SCAN_TIME_CMD bgscan; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&bgscan, userdata, sizeof(bgscan))) { ret = -EFAULT; @@ -4210,7 +4210,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_SET_DTIM: { WMI_AP_SET_DTIM_CMD d; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&d, userdata, sizeof(d))) { ret = -EFAULT; @@ -4230,7 +4230,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_TARGET_EVENT_REPORT_CMD evtCfgCmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } if (copy_from_user(&evtCfgCmd, userdata, @@ -4244,7 +4244,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_INTRA_BSS_COMM: { u8 intra=0; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&intra, userdata, sizeof(intra))) { ret = -EFAULT; @@ -4317,7 +4317,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_ADDBA_REQ_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&cmd, userdata, sizeof(cmd))) { ret = -EFAULT; @@ -4331,7 +4331,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_DELBA_REQ_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&cmd, userdata, sizeof(cmd))) { ret = -EFAULT; @@ -4345,7 +4345,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_ALLOW_AGGR_CMD cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&cmd, userdata, sizeof(cmd))) { ret = -EFAULT; @@ -4357,7 +4357,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_SET_HT_CAP: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&htCap, userdata, sizeof(htCap))) @@ -4374,7 +4374,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } case AR6000_XIOCTL_SET_HT_OP: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&htOp, userdata, sizeof(htOp))) @@ -4393,7 +4393,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_ACL_DATA: { void *osbuf = NULL; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (ar6000_create_acl_data_osbuf(dev, (u8 *)userdata, &osbuf) != 0) { ret = -EIO; @@ -4415,7 +4415,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) u8 size; size = sizeof(cmd->cmd_buf_sz); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(cmd, userdata, size)) { ret = -EFAULT; @@ -4441,7 +4441,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_WLAN_CONN_PRECEDENCE: { WMI_SET_BT_WLAN_CONN_PRECEDENCE cmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&cmd, userdata, sizeof(cmd))) { ret = -EFAULT; @@ -4466,7 +4466,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_TX_SELECT_RATES_CMD masks; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&masks, userdata, sizeof(masks))) @@ -4486,7 +4486,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_AP_HIDDEN_SSID_CMD ssid; ssid.hidden_ssid = ar->ap_hidden_ssid; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((WMI_AP_HIDDEN_SSID_CMD *)rq->ifr_data, &ssid, sizeof(WMI_AP_HIDDEN_SSID_CMD))) { @@ -4499,7 +4499,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_AP_SET_COUNTRY_CMD cty; A_MEMCPY(cty.countryCode, ar->ap_country_code, 3); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((WMI_AP_SET_COUNTRY_CMD *)rq->ifr_data, &cty, sizeof(WMI_AP_SET_COUNTRY_CMD))) { @@ -4509,7 +4509,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } case AR6000_XIOCTL_AP_GET_WMODE: { - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((u8 *)rq->ifr_data, &ar->ap_wmode, sizeof(u8))) { @@ -4522,7 +4522,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_AP_SET_DTIM_CMD dtim; dtim.dtim = ar->ap_dtim_period; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((WMI_AP_SET_DTIM_CMD *)rq->ifr_data, &dtim, sizeof(WMI_AP_SET_DTIM_CMD))) { @@ -4535,7 +4535,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_BEACON_INT_CMD bi; bi.beaconInterval = ar->ap_beacon_interval; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((WMI_BEACON_INT_CMD *)rq->ifr_data, &bi, sizeof(WMI_BEACON_INT_CMD))) { @@ -4548,7 +4548,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) WMI_SET_RTS_CMD rts; rts.threshold = ar->arRTS; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_to_user((WMI_SET_RTS_CMD *)rq->ifr_data, &rts, sizeof(WMI_SET_RTS_CMD))) { @@ -4574,7 +4574,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case AR6000_XIOCTL_AP_SET_11BG_RATESET: { WMI_AP_SET_11BG_RATESET_CMD rate; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&rate, userdata, sizeof(rate))) { ret = -EFAULT; @@ -4620,7 +4620,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { WMI_SET_TX_SGI_PARAM_CMD SGICmd; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { ret = -EIO; } else if (copy_from_user(&SGICmd, userdata, sizeof(SGICmd))){ diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c index eb62f1d..192f76d 100644 --- a/drivers/staging/ath6kl/os/linux/wireless_ext.c +++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c @@ -428,7 +428,7 @@ ar6000_ioctl_giwscan(struct net_device *dev, return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -479,7 +479,7 @@ ar6000_ioctl_siwessid(struct net_device *dev, return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -591,13 +591,13 @@ ar6000_ioctl_siwessid(struct net_device *dev, * (2) essid off has been issued * */ - if (ar->arWmiReady == true) { + if (ar->arWmiReady) { reconnect_flag = 0; status = wmi_setPmkid_cmd(ar->arWmi, ar->arBssid, NULL, 0); status = wmi_disconnect_cmd(ar->arWmi); A_MEMZERO(ar->arSsid, sizeof(ar->arSsid)); ar->arSsidLen = 0; - if (ar->arSkipScan == false) { + if (!ar->arSkipScan) { A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid)); } if (!data->flags) { @@ -616,7 +616,7 @@ ar6000_ioctl_siwessid(struct net_device *dev, * a reconnect cmd. Issue a reconnect only we are already * connected. */ - if ((ar->arConnected == true) && (ar->arWmiReady == true)) + if ((ar->arConnected) && (ar->arWmiReady)) { reconnect_flag = true; status = wmi_reconnect_cmd(ar->arWmi,ar->arReqBssid, @@ -731,7 +731,7 @@ ar6000_ioctl_siwrate(struct net_device *dev, return -EINVAL; } ar->arBitRate = kbps; - if (ar->arWmiReady == true) + if (ar->arWmiReady) { if (wmi_set_bitrate_cmd(ar->arWmi, kbps, -1, -1) != 0) { return -EINVAL; @@ -837,7 +837,7 @@ ar6000_ioctl_siwtxpow(struct net_device *dev, ar->arTxPwr = dbM = 0; ar->arTxPwrSet = false; } - if (ar->arWmiReady == true) + if (ar->arWmiReady) { AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_TX,("Set tx pwr cmd %d dbM\n", dbM)); wmi_set_txPwr_cmd(ar->arWmi, dbM); @@ -878,7 +878,7 @@ ar6000_ioctl_giwtxpow(struct net_device *dev, return -EBUSY; } - if ((ar->arWmiReady == true) && (ar->arConnected == true)) + if ((ar->arWmiReady) && (ar->arConnected)) { ar->arTxPwr = 0; @@ -897,7 +897,7 @@ ar6000_ioctl_giwtxpow(struct net_device *dev, then return value stored in the device structure */ if (!ret) { - if (ar->arTxPwrSet == true) { + if (ar->arTxPwrSet) { rrq->fixed = true; } rrq->value = ar->arTxPwr; @@ -945,7 +945,7 @@ ar6000_ioctl_siwretry(struct net_device *dev, if ( !(rrq->value >= WMI_MIN_RETRIES) || !(rrq->value <= WMI_MAX_RETRIES)) { return - EINVAL; } - if (ar->arWmiReady == true) + if (ar->arWmiReady) { if (wmi_set_retry_limits_cmd(ar->arWmi, DATA_FRAMETYPE, WMM_AC_BE, rrq->value, 0) != 0){ @@ -1200,7 +1200,7 @@ ar6000_ioctl_siwgenie(struct net_device *dev, u8 wapi_ie[128]; #endif - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } #ifdef WAPI_ENABLE @@ -1229,7 +1229,7 @@ ar6000_ioctl_giwgenie(struct net_device *dev, { AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } erq->length = 0; @@ -1253,7 +1253,7 @@ ar6000_ioctl_siwauth(struct net_device *dev, s32 ret; s32 value; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1397,7 +1397,7 @@ ar6000_ioctl_siwauth(struct net_device *dev, break; } - if (profChanged == true) { + if (profChanged) { /* * profile has changed. Erase ssid to signal change */ @@ -1421,7 +1421,7 @@ ar6000_ioctl_giwauth(struct net_device *dev, u16 param; s32 ret; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1552,7 +1552,7 @@ ar6000_ioctl_siwpmksa(struct net_device *dev, pmksa = (struct iw_pmksa *)extra; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1567,7 +1567,7 @@ ar6000_ioctl_siwpmksa(struct net_device *dev, status = wmi_setPmkid_cmd(ar->arWmi, (u8 *)pmksa->bssid.sa_data, pmksa->pmkid, false); break; case IW_PMKSA_FLUSH: - if (ar->arConnected == true) { + if (ar->arConnected) { status = wmi_setPmkid_cmd(ar->arWmi, ar->arBssid, NULL, 0); } break; @@ -1852,7 +1852,7 @@ static int ar6000_ioctl_siwpower(struct net_device *dev, AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); WMI_POWER_MODE power_mode; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -1878,7 +1878,7 @@ static int ar6000_ioctl_giwpower(struct net_device *dev, AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); WMI_POWER_MODE power_mode; - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -2025,7 +2025,7 @@ ar6000_ioctl_giwfreq(struct net_device *dev, return -EINVAL; } } else { - if (ar->arConnected != true) { + if (!ar->arConnected) { return -EINVAL; } else { freq->m = ar->arBssChannel * 100000; @@ -2059,7 +2059,7 @@ ar6000_ioctl_siwmode(struct net_device *dev, /* * clear SSID during mode switch in connected state */ - if (!(ar->arNetworkType == (((*mode) == IW_MODE_INFRA) ? INFRA_NETWORK : ADHOC_NETWORK)) && (ar->arConnected == true) ){ + if (!(ar->arNetworkType == (((*mode) == IW_MODE_INFRA) ? INFRA_NETWORK : ADHOC_NETWORK)) && (ar->arConnected) ){ A_MEMZERO(ar->arSsid, sizeof(ar->arSsid)); ar->arSsidLen = 0; } @@ -2189,7 +2189,7 @@ ar6000_ioctl_giwrange(struct net_device *dev, return -EBUSY; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -2348,7 +2348,7 @@ ar6000_ioctl_giwap(struct net_device *dev, return 0; } - if (ar->arConnected != true) { + if (!ar->arConnected) { return -EINVAL; } @@ -2382,7 +2382,7 @@ ar6000_ioctl_siwmlme(struct net_device *dev, return -EIO; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -2403,7 +2403,7 @@ ar6000_ioctl_siwmlme(struct net_device *dev, case IW_MLME_DEAUTH: /* fall through */ case IW_MLME_DISASSOC: - if ((ar->arConnected != true) || + if ((!ar->arConnected) || (memcmp(ar->arBssid, mlme.addr.sa_data, 6) != 0)) { up(&ar->arSem); @@ -2417,7 +2417,7 @@ ar6000_ioctl_siwmlme(struct net_device *dev, wmi_disconnect_cmd(ar->arWmi); A_MEMZERO(ar->arSsid, sizeof(ar->arSsid)); ar->arSsidLen = 0; - if (ar->arSkipScan == false) { + if (!ar->arSkipScan) { A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid)); } break; @@ -2467,7 +2467,7 @@ ar6000_ioctl_siwscan(struct net_device *dev, return -EOPNOTSUPP; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } @@ -2594,7 +2594,7 @@ ar6000_ioctl_siwcommit(struct net_device *dev, return -EOPNOTSUPP; } - if (ar->arWmiReady == false) { + if (!ar->arWmiReady) { return -EIO; } diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index 53fcb91..3fded6c 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c @@ -2959,7 +2959,7 @@ wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId, return A_EINVAL; } - if ((set == true) && (pmkId == NULL)) { + if ((set) && (pmkId == NULL)) { return A_EINVAL; } @@ -2972,7 +2972,7 @@ wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId, cmd = (WMI_SET_PMKID_CMD *)(A_NETBUF_DATA(osbuf)); A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid)); - if (set == true) { + if (set) { A_MEMCPY(cmd->pmkid, pmkId, sizeof(cmd->pmkid)); cmd->enable = PMKID_ENABLE; } else { @@ -2997,7 +2997,7 @@ wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, bool en) A_NETBUF_PUT(osbuf, sizeof(*cmd)); cmd = (WMI_SET_TKIP_COUNTERMEASURES_CMD *)(A_NETBUF_DATA(osbuf)); - cmd->cm_en = (en == true)? WMI_TKIP_CM_ENABLE : WMI_TKIP_CM_DISABLE; + cmd->cm_en = (en)? WMI_TKIP_CM_ENABLE : WMI_TKIP_CM_DISABLE; return (wmi_cmd_send(wmip, osbuf, WMI_SET_TKIP_COUNTERMEASURES_CMDID, NO_SYNC_WMIFLAG)); @@ -3523,7 +3523,7 @@ s8 wmi_validate_bitrate(struct wmi_t *wmip, s32 rate, s8 *rate_idx) } } - if (wmi_is_bitrate_index_valid(wmip, (s32) i) != true) { + if (!wmi_is_bitrate_index_valid(wmip, (s32) i)) { return A_EINVAL; } @@ -3547,7 +3547,7 @@ wmi_set_fixrates_cmd(struct wmi_t *wmip, u32 fixRatesMask) /* Make sure all rates in the mask are valid in the current PHY mode */ for(rateIndex = 0; rateIndex < MAX_NUMBER_OF_SUPPORT_RATES; rateIndex++) { if ((1 << rateIndex) & (u32)fixRatesMask) { - if (wmi_is_bitrate_index_valid(wmip, rateIndex) != true) { + if (wmi_is_bitrate_index_valid(!wmip, rateIndex)) { A_DPRINTF(DBG_WMI, (DBGFMT "Set Fix Rates command failed: Given rate is illegal in current PHY mode\n", DBGARG)); return A_EINVAL; } @@ -6537,8 +6537,8 @@ wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, u8 rxMetaVersion, A_NETBUF_PUT(osbuf, sizeof(*cmd)); cmd = (WMI_RX_FRAME_FORMAT_CMD *)(A_NETBUF_DATA(osbuf)); - cmd->dot11Hdr = (rxDot11Hdr==true)? 1:0; - cmd->defragOnHost = (defragOnHost==true)? 1:0; + cmd->dot11Hdr = (rxDot11Hdr)? 1:0; + cmd->defragOnHost = (defragOnHost)? 1:0; cmd->metaVersion = rxMetaVersion; /* */ /* Delete the local aggr state, on host */ @@ -6560,7 +6560,7 @@ wmi_set_thin_mode_cmd(struct wmi_t *wmip, bool bThinMode) A_NETBUF_PUT(osbuf, sizeof(*cmd)); cmd = (WMI_SET_THIN_MODE_CMD *)(A_NETBUF_DATA(osbuf)); - cmd->enable = (bThinMode==true)? 1:0; + cmd->enable = (bThinMode)? 1:0; /* Delete the local aggr state, on host */ return (wmi_cmd_send(wmip, osbuf, WMI_SET_THIN_MODE_CMDID, NO_SYNC_WMIFLAG)); -- 1.7.4.rc3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel