Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c29207a authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Fix CONSTANT_COMPARISON warnings 



Remove yoda conditions where pointed by checkpatch.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc00af0c

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -995,8 +995,8 @@ void rtl92e_link_change(struct net_device *dev) 
	if (ieee->state == RTLLIB_LINKED) {

		_rtl92e_net_update(dev);

		priv->ops->update_ratr_table(dev);

		if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||

		    (KEY_TYPE_WEP104 == ieee->pairwise_key_type))

		if ((ieee->pairwise_key_type == KEY_TYPE_WEP40) ||

		    (ieee->pairwise_key_type == KEY_TYPE_WEP104))

			rtl92e_enable_hw_security_config(dev);

	} else {

		rtl92e_writeb(dev, 0x173, 0);
@@ -1885,7 +1885,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev, 
	praddr = hdr->addr1;



	bpacket_match_bssid =

		((RTLLIB_FTYPE_CTL != type) &&

		((type != RTLLIB_FTYPE_CTL) &&

		 ether_addr_equal(priv->rtllib->current_network.bssid,

				  (fc & RTLLIB_FCTL_TODS) ? hdr->addr1 :

				  (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 :

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ void rtl92e_enable_hw_security_config(struct net_device *dev) 
	struct rtllib_device *ieee = priv->rtllib;



	SECR_value = SCR_TxEncEnable | SCR_RxDecEnable;

	if (((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||

	     (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) &&

	if (((ieee->pairwise_key_type == KEY_TYPE_WEP40) ||

	     (ieee->pairwise_key_type == KEY_TYPE_WEP104)) &&

	     (priv->rtllib->auth_mode != 2)) {

		SECR_value |= SCR_RxUseDK;

		SECR_value |= SCR_TxUseDK;

drivers/staging/rtl8192e/rtl8192e/rtl_wx.c

+2 −2
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev, 
			idx--;

		group = ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY;



		if ((!group) || (IW_MODE_ADHOC == ieee->iw_mode) ||

		if ((!group) || (ieee->iw_mode == IW_MODE_ADHOC) ||

		    (alg ==  KEY_TYPE_WEP40)) {

			if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40))

				alg = KEY_TYPE_WEP104;
@@ -1073,7 +1073,7 @@ static int _rtl92e_wx_set_promisc_mode(struct net_device *dev, 
	bPromiscuousOn = info_buf[1];

	bFilterSourceStationFrame = info_buf[2];



	if (OID_RT_INTEL_PROMISCUOUS_MODE == oid) {

	if (oid == OID_RT_INTEL_PROMISCUOUS_MODE) {

		ieee->IntelPromiscuousModeInfo.bPromiscuousOn =

					(bPromiscuousOn) ? (true) : (false);

		ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame =

drivers/staging/rtl8192e/rtl819x_BAProc.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, 
	*tag++ = type;

	*tag++ = pBA->DialogToken;



	if (ACT_ADDBARSP == type) {

	if (type == ACT_ADDBARSP) {

		RT_TRACE(COMP_DBG, "====>to send ADDBARSP\n");



		put_unaligned_le16(StatusCode, tag);
@@ -126,7 +126,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, 
	put_unaligned_le16(pBA->BaTimeoutValue, tag);

	tag += 2;



	if (ACT_ADDBAREQ == type) {

	if (type == ACT_ADDBAREQ) {

		memcpy(tag, (u8 *)&(pBA->BaStartSeqCtrl), 2);

		tag += 2;

	}

drivers/staging/rtl8192e/rtllib_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb, 
{

	int ret = 0;



	if ((NULL == ieee) || (NULL == skb) || (NULL == rx_stats)) {

	if (!ieee || !skb || !rx_stats) {

		pr_info("%s: Input parameters NULL!\n", __func__);

		goto rx_dropped;

	}
@@ -2554,7 +2554,7 @@ static inline int is_beacon(u16 fc) 


static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel)

{

	if (MAX_CHANNEL_NUMBER < channel) {

	if (channel > MAX_CHANNEL_NUMBER) {

		netdev_info(rtllib->dev, "%s(): Invalid Channel\n", __func__);

		return 0;

	}
@@ -2567,7 +2567,7 @@ static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel) 


int rtllib_legal_channel(struct rtllib_device *rtllib, u8 channel)

{

	if (MAX_CHANNEL_NUMBER < channel) {

	if (channel > MAX_CHANNEL_NUMBER) {

		netdev_info(rtllib->dev, "%s(): Invalid Channel\n", __func__);

		return 0;

	}