From 941b19fc7baf30bd552389773cd8d96364b17184 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 20 Dec 2007 17:21:36 -0500 Subject: [PATCH] --- yaml --- r: 79337 b: refs/heads/master c: 15617858b3cf249a3577df8da970f779bbc8a737 h: refs/heads/master i: 79335: 0a0414ece1cda28adc893e77f6737693e791f5b8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33923e23de1c..dd9164f11a14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0300b3321d9ed73a0c3f575f2df250c577852356 +refs/heads/master: 15617858b3cf249a3577df8da970f779bbc8a737 diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index 9d3f3357b6e1..68c5e54230c1 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/drivers/net/wireless/airo.c @@ -3847,7 +3847,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) ai->config.authType = AUTH_OPEN; ai->config.modulation = MOD_CCK; - if ((cap_rid.len>=sizeof(cap_rid)) && (cap_rid.extSoftCap&1) && + if ((cap_rid.len>=sizeof(cap_rid)) && + (cap_rid.extSoftCap & cpu_to_le16(1)) && (micsetup(ai) == SUCCESS)) { ai->config.opmode |= MODE_MIC; set_bit(FLAG_MIC_CAPABLE, &ai->flags);