Commit f59d9782 authored by Roel Kluin's avatar Roel Kluin Committed by David S. Miller

wireless: fix '!x & y' typo's

Fix priority mistakes similar to '!x & y'
Signed-off-by: default avatarRoel Kluin <12o3l@tiscali.nl>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9f9dac28
...@@ -6407,7 +6407,7 @@ static int airo_set_encode(struct net_device *dev, ...@@ -6407,7 +6407,7 @@ static int airo_set_encode(struct net_device *dev,
set_wep_key(local, index, NULL, 0, perm, 1); set_wep_key(local, index, NULL, 0, perm, 1);
} else } else
/* Don't complain if only change the mode */ /* Don't complain if only change the mode */
if(!dwrq->flags & IW_ENCODE_MODE) { if(!(dwrq->flags & IW_ENCODE_MODE)) {
return -EINVAL; return -EINVAL;
} }
} }
......
...@@ -1759,7 +1759,7 @@ static int atmel_set_encode(struct net_device *dev, ...@@ -1759,7 +1759,7 @@ static int atmel_set_encode(struct net_device *dev,
priv->default_key = index; priv->default_key = index;
} else } else
/* Don't complain if only change the mode */ /* Don't complain if only change the mode */
if (!dwrq->flags & IW_ENCODE_MODE) { if (!(dwrq->flags & IW_ENCODE_MODE)) {
return -EINVAL; return -EINVAL;
} }
} }
......
...@@ -1398,7 +1398,7 @@ static int wlan_get_encodeext(struct net_device *dev, ...@@ -1398,7 +1398,7 @@ static int wlan_get_encodeext(struct net_device *dev,
index = adapter->wep_tx_keyidx; index = adapter->wep_tx_keyidx;
} }
if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY && if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) &&
ext->alg != IW_ENCODE_ALG_WEP) { ext->alg != IW_ENCODE_ALG_WEP) {
if (index != 0 || adapter->mode != IW_MODE_INFRA) if (index != 0 || adapter->mode != IW_MODE_INFRA)
goto out; goto out;
......
...@@ -375,7 +375,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) ...@@ -375,7 +375,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)
pad = entry_data->align[0]; pad = entry_data->align[0];
if (!status.control.flags & IEEE80211_TXCTL_NO_ACK) { if (!(status.control.flags & IEEE80211_TXCTL_NO_ACK)) {
if (!(payload->status & 0x01)) if (!(payload->status & 0x01))
status.flags |= IEEE80211_TX_STATUS_ACK; status.flags |= IEEE80211_TX_STATUS_ACK;
else else
......
...@@ -1118,7 +1118,7 @@ prism54_set_encode(struct net_device *ndev, struct iw_request_info *info, ...@@ -1118,7 +1118,7 @@ prism54_set_encode(struct net_device *ndev, struct iw_request_info *info,
mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
&index); &index);
} else { } else {
if (!dwrq->flags & IW_ENCODE_MODE) { if (!(dwrq->flags & IW_ENCODE_MODE)) {
/* we cannot do anything. Complain. */ /* we cannot do anything. Complain. */
return -EINVAL; return -EINVAL;
} }
...@@ -2610,7 +2610,7 @@ prism2_ioctl_set_encryption(struct net_device *dev, ...@@ -2610,7 +2610,7 @@ prism2_ioctl_set_encryption(struct net_device *dev,
mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
&index); &index);
} else { } else {
if (!param->u.crypt.flags & IW_ENCODE_MODE) { if (!(param->u.crypt.flags & IW_ENCODE_MODE)) {
/* we cannot do anything. Complain. */ /* we cannot do anything. Complain. */
return -EINVAL; return -EINVAL;
} }
......
...@@ -403,7 +403,7 @@ static int uw2453_init_hw(struct zd_rf *rf) ...@@ -403,7 +403,7 @@ static int uw2453_init_hw(struct zd_rf *rf)
if (r) if (r)
return r; return r;
if (!intr_status & 0xf) { if (!(intr_status & 0xf)) {
dev_dbg_f(zd_chip_dev(chip), dev_dbg_f(zd_chip_dev(chip),
"PLL locked on configuration %d\n", i); "PLL locked on configuration %d\n", i);
found_config = i; found_config = i;
......
...@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, ...@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
} else } else
idx = ieee->tx_keyidx; idx = ieee->tx_keyidx;
if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY && if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) &&
ext->alg != IW_ENCODE_ALG_WEP) ext->alg != IW_ENCODE_ALG_WEP)
if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA) if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA)
return -EINVAL; return -EINVAL;
......
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