diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
commit | b02957d58a27525499ab10d272d3b44682a7ae50 (patch) | |
tree | a220aaf44026a8be815320b3c91f1db43bbf1e2c /drivers/staging/wlan-ng/p80211wext.c | |
parent | 3a8954e8f22cf31791d8c524c2839433e39f9368 (diff) | |
parent | b94c765ac31f8eb9c6fe895ba611bb446b799635 (diff) | |
download | op-kernel-dev-b02957d58a27525499ab10d272d3b44682a7ae50.zip op-kernel-dev-b02957d58a27525499ab10d272d3b44682a7ae50.tar.gz |
Staging: Merge two branches of coding style fixes together
Turns out that multiple people sent pretty much the same patch
for the same staging drivers. Commit these in two different
branches and merge them together to get a more complete coverage
of the cleanup and properly credit everyone for the work that they
did.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211wext.c')
-rw-r--r-- | drivers/staging/wlan-ng/p80211wext.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c index 9fb9532..2fa1dfa 100644 --- a/drivers/staging/wlan-ng/p80211wext.c +++ b/drivers/staging/wlan-ng/p80211wext.c @@ -46,8 +46,8 @@ #include <linux/wireless.h> #include <net/iw_handler.h> #include <linux/if_arp.h> -#include <asm/bitops.h> -#include <asm/uaccess.h> +#include <linux/bitops.h> +#include <linux/uaccess.h> #include <asm/byteorder.h> #include <linux/if_ether.h> #include <linux/bitops.h> @@ -553,15 +553,14 @@ static int p80211wext_siwencode(netdevice_t *dev, } /* Check the Key index first. */ - i = (erq->flags & IW_ENCODE_INDEX); + i = (erq->flags & IW_ENCODE_INDEX); if (i) { - if ((i < 1) || (i > NUM_WEPKEYS)) { err = -EINVAL; goto exit; - } else + } else { i--; - + } /* Set current key number only if no keys are given */ if (erq->flags & IW_ENCODE_NOKEY) { result = |