wireless: fix '!x & y' typo's
authorRoel Kluin <12o3l@tiscali.nl>
Fri, 26 Oct 2007 19:51:26 +0000 (21:51 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:03:35 +0000 (15:03 -0800)
Fix priority mistakes similar to '!x & y'

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/airo.c
drivers/net/wireless/atmel.c
drivers/net/wireless/libertas/wext.c
drivers/net/wireless/p54common.c
drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
net/ieee80211/ieee80211_wx.c

index 074055e..e3eca6d 100644 (file)
@@ -6407,7 +6407,7 @@ static int airo_set_encode(struct net_device *dev,
                        set_wep_key(local, index, NULL, 0, perm, 1);
                } else
                        /* Don't complain if only change the mode */
-                       if(!dwrq->flags & IW_ENCODE_MODE) {
+                       if(!(dwrq->flags & IW_ENCODE_MODE)) {
                                return -EINVAL;
                        }
        }
index 059ce3f..57cc7e5 100644 (file)
@@ -1759,7 +1759,7 @@ static int atmel_set_encode(struct net_device *dev,
                        priv->default_key = index;
                } else
                        /* Don't complain if only change the mode */
-                       if (!dwrq->flags & IW_ENCODE_MODE) {
+                       if (!(dwrq->flags & IW_ENCODE_MODE)) {
                                return -EINVAL;
                        }
        }
index 135116d..4dec5e5 100644 (file)
@@ -1398,7 +1398,7 @@ static int wlan_get_encodeext(struct net_device *dev,
                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) {
                if (index != 0 || adapter->mode != IW_MODE_INFRA)
                        goto out;
index 5f8d898..ad5c307 100644 (file)
@@ -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)
                                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))
                                        status.flags |= IEEE80211_TX_STATUS_ACK;
                                else
index 6d80ca4..b9d0073 100644 (file)
@@ -1118,7 +1118,7 @@ prism54_set_encode(struct net_device *ndev, struct iw_request_info *info,
                            mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
                                            &index);
                } else {
-                       if (!dwrq->flags & IW_ENCODE_MODE) {
+                       if (!(dwrq->flags & IW_ENCODE_MODE)) {
                                /* we cannot do anything. Complain. */
                                return -EINVAL;
                        }
@@ -2610,7 +2610,7 @@ prism2_ioctl_set_encryption(struct net_device *dev,
                            mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
                                            &index);
                } else {
-                       if (!param->u.crypt.flags & IW_ENCODE_MODE) {
+                       if (!(param->u.crypt.flags & IW_ENCODE_MODE)) {
                                /* we cannot do anything. Complain. */
                                return -EINVAL;
                        }
index 857dcf3..3c1cca4 100644 (file)
@@ -403,7 +403,7 @@ static int uw2453_init_hw(struct zd_rf *rf)
                if (r)
                        return r;
 
-               if (!intr_status & 0xf) {
+               if (!(intr_status & 0xf)) {
                        dev_dbg_f(zd_chip_dev(chip),
                                "PLL locked on configuration %d\n", i);
                        found_config = i;
index d309e8f..623489a 100644 (file)
@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
        } else
                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)
                if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA)
                        return -EINVAL;