diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-26 16:26:56 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-26 16:26:56 +0300 |
| commit | 0564161ea902c6c3e7e45ffd2df37bcb0d235acb (patch) | |
| tree | 073cefc403e1ec5a8a267fc98130ac6d9191dc5c /drivers/net/wireless/airo.c | |
| parent | 40abc2defbca6a6d7fde49082586430350d0a535 (diff) | |
| parent | 377526578f2c343ea281a918b18ece1fca65005c (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 1c008c61b95c..ddc061dd150c 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -1869,7 +1869,7 @@ static int readStatsRid(struct airo_info*ai, StatsRid *sr, int rid, int lock) static void try_auto_wep(struct airo_info *ai) { - if (auto_wep && !(ai->flags & FLAG_RADIO_DOWN)) { + if (auto_wep && !test_bit(FLAG_RADIO_DOWN, &ai->flags)) { ai->expires = RUN_AT(3*HZ); wake_up_interruptible(&ai->thr_wait); } |