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/xmit.c | |
| 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/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/xmit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c index 12fca99f7578..b8e39dd06e99 100644 --- a/drivers/net/wireless/b43legacy/xmit.c +++ b/drivers/net/wireless/b43legacy/xmit.c | |||
| @@ -274,7 +274,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, | |||
| 274 | 274 | ||
| 275 | /* PHY TX Control word */ | 275 | /* PHY TX Control word */ |
| 276 | if (rate_ofdm) | 276 | if (rate_ofdm) |
| 277 | phy_ctl |= B43legacy_TX4_PHY_OFDM; | 277 | phy_ctl |= B43legacy_TX4_PHY_ENC_OFDM; |
| 278 | if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) | 278 | if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) |
| 279 | phy_ctl |= B43legacy_TX4_PHY_SHORTPRMBL; | 279 | phy_ctl |= B43legacy_TX4_PHY_SHORTPRMBL; |
| 280 | switch (info->antenna_sel_tx) { | 280 | switch (info->antenna_sel_tx) { |