diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 22:34:25 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 22:34:25 +0200 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | [ARM] 5143/1: pxa: further cleanup PXA Kconfig by removing one (diff) | |
| parent | [ARM] mach-types update (diff) | |
| download | linux-f974a8ec96571535ee07880a023bcce0e3f2c76b.tar.xz linux-f974a8ec96571535ee07880a023bcce0e3f2c76b.zip | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index b22c02737185..2673d568bcac 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -483,9 +483,9 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev) if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) return; - ieee80211_iterate_active_interfaces(rt2x00dev->hw, - rt2x00lib_beacondone_iter, - rt2x00dev); + ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw, + rt2x00lib_beacondone_iter, + rt2x00dev); queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); } @@ -507,7 +507,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, * Update TX statistics. */ rt2x00dev->link.qual.tx_success += success; - rt2x00dev->link.qual.tx_failed += txdesc->retry + fail; + rt2x00dev->link.qual.tx_failed += fail; /* * Initialize TX status |