diff options
-rw-r--r-- | drivers/net/wireless/airo.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/atmel.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/wext.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/p54common.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 2 | ||||
-rw-r--r-- | net/ieee80211/ieee80211_wx.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 074055e18c5c..e3eca6d047c7 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -6407,7 +6407,7 @@ static int airo_set_encode(struct net_device *dev, | |||
6407 | set_wep_key(local, index, NULL, 0, perm, 1); | 6407 | set_wep_key(local, index, NULL, 0, perm, 1); |
6408 | } else | 6408 | } else |
6409 | /* Don't complain if only change the mode */ | 6409 | /* Don't complain if only change the mode */ |
6410 | if(!dwrq->flags & IW_ENCODE_MODE) { | 6410 | if(!(dwrq->flags & IW_ENCODE_MODE)) { |
6411 | return -EINVAL; | 6411 | return -EINVAL; |
6412 | } | 6412 | } |
6413 | } | 6413 | } |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 059ce3f07dba..57cc7e58bfe5 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -1759,7 +1759,7 @@ static int atmel_set_encode(struct net_device *dev, | |||
1759 | priv->default_key = index; | 1759 | priv->default_key = index; |
1760 | } else | 1760 | } else |
1761 | /* Don't complain if only change the mode */ | 1761 | /* Don't complain if only change the mode */ |
1762 | if (!dwrq->flags & IW_ENCODE_MODE) { | 1762 | if (!(dwrq->flags & IW_ENCODE_MODE)) { |
1763 | return -EINVAL; | 1763 | return -EINVAL; |
1764 | } | 1764 | } |
1765 | } | 1765 | } |
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index 135116d90703..4dec5e5565bb 100644 --- a/drivers/net/wireless/libertas/wext.c +++ b/drivers/net/wireless/libertas/wext.c | |||
@@ -1398,7 +1398,7 @@ static int wlan_get_encodeext(struct net_device *dev, | |||
1398 | index = adapter->wep_tx_keyidx; | 1398 | index = adapter->wep_tx_keyidx; |
1399 | } | 1399 | } |
1400 | 1400 | ||
1401 | if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY && | 1401 | if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) && |
1402 | ext->alg != IW_ENCODE_ALG_WEP) { | 1402 | ext->alg != IW_ENCODE_ALG_WEP) { |
1403 | if (index != 0 || adapter->mode != IW_MODE_INFRA) | 1403 | if (index != 0 || adapter->mode != IW_MODE_INFRA) |
1404 | goto out; | 1404 | goto out; |
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c index 5f8d898502ae..ad5c307a4410 100644 --- a/drivers/net/wireless/p54common.c +++ b/drivers/net/wireless/p54common.c | |||
@@ -375,7 +375,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
375 | if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) | 375 | if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) |
376 | pad = entry_data->align[0]; | 376 | pad = entry_data->align[0]; |
377 | 377 | ||
378 | if (!status.control.flags & IEEE80211_TXCTL_NO_ACK) { | 378 | if (!(status.control.flags & IEEE80211_TXCTL_NO_ACK)) { |
379 | if (!(payload->status & 0x01)) | 379 | if (!(payload->status & 0x01)) |
380 | status.flags |= IEEE80211_TX_STATUS_ACK; | 380 | status.flags |= IEEE80211_TX_STATUS_ACK; |
381 | else | 381 | else |
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 6d80ca421cf0..b9d00730a68d 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -1118,7 +1118,7 @@ prism54_set_encode(struct net_device *ndev, struct iw_request_info *info, | |||
1118 | mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, | 1118 | mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, |
1119 | &index); | 1119 | &index); |
1120 | } else { | 1120 | } else { |
1121 | if (!dwrq->flags & IW_ENCODE_MODE) { | 1121 | if (!(dwrq->flags & IW_ENCODE_MODE)) { |
1122 | /* we cannot do anything. Complain. */ | 1122 | /* we cannot do anything. Complain. */ |
1123 | return -EINVAL; | 1123 | return -EINVAL; |
1124 | } | 1124 | } |
@@ -2610,7 +2610,7 @@ prism2_ioctl_set_encryption(struct net_device *dev, | |||
2610 | mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, | 2610 | mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, |
2611 | &index); | 2611 | &index); |
2612 | } else { | 2612 | } else { |
2613 | if (!param->u.crypt.flags & IW_ENCODE_MODE) { | 2613 | if (!(param->u.crypt.flags & IW_ENCODE_MODE)) { |
2614 | /* we cannot do anything. Complain. */ | 2614 | /* we cannot do anything. Complain. */ |
2615 | return -EINVAL; | 2615 | return -EINVAL; |
2616 | } | 2616 | } |
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c index 857dcf3eae61..3c1cca4c0a3e 100644 --- a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c +++ b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | |||
@@ -403,7 +403,7 @@ static int uw2453_init_hw(struct zd_rf *rf) | |||
403 | if (r) | 403 | if (r) |
404 | return r; | 404 | return r; |
405 | 405 | ||
406 | if (!intr_status & 0xf) { | 406 | if (!(intr_status & 0xf)) { |
407 | dev_dbg_f(zd_chip_dev(chip), | 407 | dev_dbg_f(zd_chip_dev(chip), |
408 | "PLL locked on configuration %d\n", i); | 408 | "PLL locked on configuration %d\n", i); |
409 | found_config = i; | 409 | found_config = i; |
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index d309e8f19992..623489afa62c 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c | |||
@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, | |||
709 | } else | 709 | } else |
710 | idx = ieee->tx_keyidx; | 710 | idx = ieee->tx_keyidx; |
711 | 711 | ||
712 | if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY && | 712 | if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) && |
713 | ext->alg != IW_ENCODE_ALG_WEP) | 713 | ext->alg != IW_ENCODE_ALG_WEP) |
714 | if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA) | 714 | if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA) |
715 | return -EINVAL; | 715 | return -EINVAL; |