diff options
| author | Ingo Molnar | 2008-07-08 10:32:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-08 10:32:56 +0200 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /drivers/net/wireless/hostap/hostap_ap.c | |
| parent | x86, mpparse: build fix (diff) | |
| parent | Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | kernel-qcow2-linux-896395c290f902576270d84291c1f7f8bfbe339d.tar.gz kernel-qcow2-linux-896395c290f902576270d84291c1f7f8bfbe339d.tar.xz kernel-qcow2-linux-896395c290f902576270d84291c1f7f8bfbe339d.zip | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ap.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 0acd9589c48c..ab981afd481d 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c @@ -1930,7 +1930,7 @@ static void handle_pspoll(local_info_t *local, PDEBUG(DEBUG_PS, " PSPOLL and AID[15:14] not set\n"); return; } - aid &= ~BIT(15) & ~BIT(14); + aid &= ~(BIT(15) | BIT(14)); if (aid == 0 || aid > MAX_AID_TABLE_SIZE) { PDEBUG(DEBUG_PS, " invalid aid=%d\n", aid); return; |