diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/airo.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/atmel.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/wext.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 10 |
8 files changed, 14 insertions, 18 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index d8948bf..42670ac 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -6408,9 +6408,8 @@ 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; - } } /* Read the flags */ if(dwrq->flags & IW_ENCODE_DISABLED) diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 57cc7e5..32fbaf2 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -1759,9 +1759,8 @@ 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; - } } /* Read the flags */ if (dwrq->flags & IW_ENCODE_DISABLED) { diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index b6bf205..a366129 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c @@ -97,7 +97,7 @@ out_unlock: return err; } -char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev) +char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev) { struct b43legacy_wl *wl = dev->wl; diff --git a/drivers/net/wireless/b43legacy/rfkill.h b/drivers/net/wireless/b43legacy/rfkill.h index 4a81ba3..b68215e 100644 --- a/drivers/net/wireless/b43legacy/rfkill.h +++ b/drivers/net/wireless/b43legacy/rfkill.h @@ -27,7 +27,7 @@ void b43legacy_rfkill_free(struct b43legacy_wldev *dev); void b43legacy_rfkill_init(struct b43legacy_wldev *dev); void b43legacy_rfkill_exit(struct b43legacy_wldev *dev); -char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev); +char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev); #else /* CONFIG_B43LEGACY_RFKILL */ @@ -49,7 +49,7 @@ static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev) static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev) { } -static inline char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev) +static inline char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev) { return NULL; } diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h index 0a5a08d..71c9a7e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h @@ -350,7 +350,7 @@ struct iwl_eeprom { #define CSR_FH_INT_TX_MASK (CSR_FH_INT_BIT_TX_CHNL6 | \ CSR_FH_INT_BIT_TX_CHNL1 | \ - CSR_FH_INT_BIT_TX_CHNL0 ) + CSR_FH_INT_BIT_TX_CHNL0) /* RESET */ diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h index 21c7577..4afd69d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h @@ -400,7 +400,7 @@ struct iwl_eeprom { #define CSR_FH_INT_TX_MASK (CSR_FH_INT_BIT_TX_CHNL6 | \ CSR_FH_INT_BIT_TX_CHNL1 | \ - CSR_FH_INT_BIT_TX_CHNL0 ) + CSR_FH_INT_BIT_TX_CHNL0) /* RESET */ diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index 4ef5b9e..19c2873 100644 --- a/drivers/net/wireless/libertas/wext.c +++ b/drivers/net/wireless/libertas/wext.c @@ -32,10 +32,8 @@ static inline void libertas_postpone_association_work(wlan_private *priv) static inline void libertas_cancel_association_work(wlan_private *priv) { cancel_delayed_work(&priv->assoc_work); - if (priv->adapter->pending_assoc_req) { - kfree(priv->adapter->pending_assoc_req); - priv->adapter->pending_assoc_req = NULL; - } + kfree(priv->adapter->pending_assoc_req); + priv->adapter->pending_assoc_req = NULL; } diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index f5b38de..da1d4e8 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c @@ -3223,14 +3223,14 @@ wv_mmc_init(struct net_device * dev) * non-NCR/AT&T/Lucent PCMCIA cards, see wavelan_cs.h for detail on * how to configure your card... */ - for(i = 0; i < ARRAY_SIZE(MAC_ADDRESSES); i++) - if((psa.psa_univ_mac_addr[0] == MAC_ADDRESSES[i][0]) && - (psa.psa_univ_mac_addr[1] == MAC_ADDRESSES[i][1]) && - (psa.psa_univ_mac_addr[2] == MAC_ADDRESSES[i][2])) + for (i = 0; i < ARRAY_SIZE(MAC_ADDRESSES); i++) + if ((psa.psa_univ_mac_addr[0] == MAC_ADDRESSES[i][0]) && + (psa.psa_univ_mac_addr[1] == MAC_ADDRESSES[i][1]) && + (psa.psa_univ_mac_addr[2] == MAC_ADDRESSES[i][2])) break; /* If we have not found it... */ - if(i == ARRAY_SIZE(MAC_ADDRESSES)) + if (i == ARRAY_SIZE(MAC_ADDRESSES)) { #ifdef DEBUG_CONFIG_ERRORS printk(KERN_WARNING "%s: wv_mmc_init(): Invalid MAC address: %02X:%02X:%02X:...\n", |