Commit 9415b671 authored by Szilveszter Székely's avatar Szilveszter Székely Committed by Greg Kroah-Hartman

staging: rtl8192u: swap comparison to constant

Comparisons should place the constant on the right side of the test

This patch fixes coding style issues as reported by checkpatch.
Signed-off-by: default avatarSzilveszter Székely <szekelyszilv@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e5fa9e2
...@@ -1797,8 +1797,8 @@ static void rtl8192_link_change(struct net_device *dev) ...@@ -1797,8 +1797,8 @@ static void rtl8192_link_change(struct net_device *dev)
* way, but there is no chance to set this as wep will not set * way, but there is no chance to set this as wep will not set
* group key in wext. * group key in wext.
*/ */
if (KEY_TYPE_WEP40 == ieee->pairwise_key_type || if (ieee->pairwise_key_type == KEY_TYPE_WEP40 ||
KEY_TYPE_WEP104 == ieee->pairwise_key_type) ieee->pairwise_key_type == KEY_TYPE_WEP104)
EnableHWSecurityConfig8192(dev); EnableHWSecurityConfig8192(dev);
} }
/*update timing params*/ /*update timing params*/
...@@ -2071,7 +2071,7 @@ static bool GetNmodeSupportBySecCfg8192(struct net_device *dev) ...@@ -2071,7 +2071,7 @@ static bool GetNmodeSupportBySecCfg8192(struct net_device *dev)
*/ */
encrypt = (network->capability & WLAN_CAPABILITY_PRIVACY) || encrypt = (network->capability & WLAN_CAPABILITY_PRIVACY) ||
(ieee->host_encrypt && crypt && crypt->ops && (ieee->host_encrypt && crypt && crypt->ops &&
(0 == strcmp(crypt->ops->name, "WEP"))); (strcmp(crypt->ops->name, "WEP") == 0));
/* simply judge */ /* simply judge */
if (encrypt && (wpa_ie_len == 0)) { if (encrypt && (wpa_ie_len == 0)) {
...@@ -4498,7 +4498,7 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb, ...@@ -4498,7 +4498,7 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
praddr = hdr->addr1; praddr = hdr->addr1;
/* Check if the received packet is acceptable. */ /* Check if the received packet is acceptable. */
bpacket_match_bssid = (IEEE80211_FTYPE_CTL != type) && bpacket_match_bssid = (type != IEEE80211_FTYPE_CTL) &&
(eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3)) (eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
&& (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV); && (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV);
bpacket_toself = bpacket_match_bssid & bpacket_toself = bpacket_match_bssid &
...@@ -5098,7 +5098,7 @@ void EnableHWSecurityConfig8192(struct net_device *dev) ...@@ -5098,7 +5098,7 @@ void EnableHWSecurityConfig8192(struct net_device *dev)
struct ieee80211_device *ieee = priv->ieee80211; struct ieee80211_device *ieee = priv->ieee80211;
SECR_value = SCR_TxEncEnable | SCR_RxDecEnable; SECR_value = SCR_TxEncEnable | SCR_RxDecEnable;
if (((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) && (priv->ieee80211->auth_mode != 2)) { if (((ieee->pairwise_key_type == KEY_TYPE_WEP40) || (ieee->pairwise_key_type == KEY_TYPE_WEP104)) && (priv->ieee80211->auth_mode != 2)) {
SECR_value |= SCR_RxUseDK; SECR_value |= SCR_RxUseDK;
SECR_value |= SCR_TxUseDK; SECR_value |= SCR_TxUseDK;
} else if ((ieee->iw_mode == IW_MODE_ADHOC) && (ieee->pairwise_key_type & (KEY_TYPE_CCMP | KEY_TYPE_TKIP))) { } else if ((ieee->iw_mode == IW_MODE_ADHOC) && (ieee->pairwise_key_type & (KEY_TYPE_CCMP | KEY_TYPE_TKIP))) {
......
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