diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2009-04-11 12:26:01 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:45 -0400 |
commit | 2d1f96dd90a20c25243cc3b13e9f21d72f00aba0 (patch) | |
tree | 76dc36f2b2d700ea045b287689405d430d6e5d04 /drivers/net/wireless/b43legacy/b43legacy.h | |
parent | 7858e07b7ccf1d2fd5898a405c93d022d3f1f42d (diff) |
b43legacy: Clean up beacon IRQ
This patch ports commit c97a4ccc1fad35d3 "b43: Fix beacon BH update" to
b43legacy. It fixes beacon updating in the bottomhalf. In case the device
is busy, we will defer to later in the IRQ handler.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Michael Buesch <mb@bu3sch.de>
Tested-by: David Ellingsworth <david@identd.dyndns.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy/b43legacy.h')
-rw-r--r-- | drivers/net/wireless/b43legacy/b43legacy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h index ad4794a0a327..da59ef02b6ef 100644 --- a/drivers/net/wireless/b43legacy/b43legacy.h +++ b/drivers/net/wireless/b43legacy/b43legacy.h | |||
@@ -259,7 +259,6 @@ | |||
259 | 259 | ||
260 | #define B43legacy_IRQ_ALL 0xFFFFFFFF | 260 | #define B43legacy_IRQ_ALL 0xFFFFFFFF |
261 | #define B43legacy_IRQ_MASKTEMPLATE (B43legacy_IRQ_MAC_SUSPENDED | \ | 261 | #define B43legacy_IRQ_MASKTEMPLATE (B43legacy_IRQ_MAC_SUSPENDED | \ |
262 | B43legacy_IRQ_BEACON | \ | ||
263 | B43legacy_IRQ_TBTT_INDI | \ | 262 | B43legacy_IRQ_TBTT_INDI | \ |
264 | B43legacy_IRQ_ATIM_END | \ | 263 | B43legacy_IRQ_ATIM_END | \ |
265 | B43legacy_IRQ_PMQ | \ | 264 | B43legacy_IRQ_PMQ | \ |
@@ -617,6 +616,7 @@ struct b43legacy_wl { | |||
617 | struct sk_buff *current_beacon; | 616 | struct sk_buff *current_beacon; |
618 | bool beacon0_uploaded; | 617 | bool beacon0_uploaded; |
619 | bool beacon1_uploaded; | 618 | bool beacon1_uploaded; |
619 | bool beacon_templates_virgin; /* Never wrote the templates? */ | ||
620 | struct work_struct beacon_update_trigger; | 620 | struct work_struct beacon_update_trigger; |
621 | }; | 621 | }; |
622 | 622 | ||