diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 12:59:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 12:59:24 +0000 |
| commit | e7f3111f2c324fefb55715a061b93af4e7991ae3 (patch) | |
| tree | 4b136ea41d399c790384cb9c99f5c6cffa99bb03 /package/mac80211/patches/440-ath5k_calibrate_no_queue_stop.patch | |
| parent | 43c8254ea249e359d6430862c481c30f9cac7f95 (diff) | |
| download | upstream-e7f3111f2c324fefb55715a061b93af4e7991ae3.tar.gz upstream-e7f3111f2c324fefb55715a061b93af4e7991ae3.tar.bz2 upstream-e7f3111f2c324fefb55715a061b93af4e7991ae3.zip | |
mac80211: reorganize patches, fold in patches that were merged upstream
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30863 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/440-ath5k_calibrate_no_queue_stop.patch')
| -rw-r--r-- | package/mac80211/patches/440-ath5k_calibrate_no_queue_stop.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/package/mac80211/patches/440-ath5k_calibrate_no_queue_stop.patch b/package/mac80211/patches/440-ath5k_calibrate_no_queue_stop.patch deleted file mode 100644 index 3751c531ba..0000000000 --- a/package/mac80211/patches/440-ath5k_calibrate_no_queue_stop.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/base.c -+++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -2330,15 +2330,6 @@ ath5k_calibrate_work(struct work_struct - "got new rfgain, resetting\n"); - ieee80211_queue_work(ah->hw, &ah->reset_work); - } -- -- /* TODO: On full calibration we should stop TX here, -- * so that it doesn't interfere (mostly due to gain_f -- * calibration that messes with tx packets -see phy.c). -- * -- * NOTE: Stopping the queues from above is not enough -- * to stop TX but saves us from disconecting (at least -- * we don't lose packets). */ -- ieee80211_stop_queues(ah->hw); - } else - ah->ah_cal_mask |= AR5K_CALIBRATION_SHORT; - -@@ -2353,10 +2344,9 @@ ath5k_calibrate_work(struct work_struct - ah->curchan->center_freq)); - - /* Clear calibration flags */ -- if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) { -- ieee80211_wake_queues(ah->hw); -+ if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) - ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL; -- } else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT) -+ else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT) - ah->ah_cal_mask &= ~AR5K_CALIBRATION_SHORT; - } - |