diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-30 04:51:00 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-30 04:51:00 (GMT) |
commit | e93dc4891df93d7efa59d861fdcbb529a1819343 (patch) | |
tree | 545d95bc78c76d44b22bf2590c033311f44c0616 /drivers/net/wireless/b43legacy/main.c | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
parent | 56a6d13dfd49d90d72a1a962246206719dd9d143 (diff) | |
download | linux-e93dc4891df93d7efa59d861fdcbb529a1819343.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index a1b8bf3..2541c81 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -3702,8 +3702,7 @@ static int b43legacy_wireless_init(struct ssb_device *dev) } /* fill hw info */ - hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE | - IEEE80211_HW_RX_INCLUDES_FCS | + hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM; hw->queues = 1; /* FIXME: hardware has more queues */ @@ -3846,10 +3845,10 @@ static int b43legacy_resume(struct ssb_device *dev) goto out; } } - mutex_unlock(&wl->mutex); b43legacydbg(wl, "Device resumed.\n"); out: + mutex_unlock(&wl->mutex); return err; } |