aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/airo.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-24 00:29:57 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-24 00:29:57 -0400
commitdb21e578e551421d76641d72cb3f8296ed3f9e61 (patch)
tree73968aeda7ed0051b5cff6950ad513011a3c7a5f /drivers/net/wireless/airo.c
parent6ed14254cb6e269030ff09bed8673473b7be0283 (diff)
parentdf8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r--drivers/net/wireless/airo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 7f2dacf634e..4069b79d825 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2768,7 +2768,7 @@ static int airo_test_wpa_capable(struct airo_info *ai)
/* Only firmware versions 5.30.17 or better can do WPA */
if ((cap_rid.softVer > 0x530)
- || ((cap_rid.softVer == 0x530) && (cap_rid.softSubVer >= 0x17))) {
+ || ((cap_rid.softVer == 0x530) && (cap_rid.softSubVer >= 17))) {
airo_print_info(name, "WPA is supported.");
return 1;
}