072937888e
3.18.12 backported 61ada528dea028331e99e8ceaed87c683ad25de2 ("sched/wait:
Provide infrastructure to deal with nested blocking") from 3.19, causing
the following error on load:
[ 13.588000] compat: exports duplicate symbol woken_wake_function (owned by kernel)
Fix this by guarding it with a check for 3.18.11 or earlier instead of
3.19.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45710
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From: Oleksij Rempel <linux@rempel-privat.de>
|
|
Date: Sun, 22 Mar 2015 19:29:53 +0100
|
|
Subject: [PATCH] ath9k: use one shot read in ath9k_hw_update_mibstats
|
|
|
|
this will reduce some overhead on usb bus.
|
|
|
|
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/ani.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/ani.c
|
|
@@ -107,11 +107,21 @@ static const struct ani_cck_level_entry
|
|
static void ath9k_hw_update_mibstats(struct ath_hw *ah,
|
|
struct ath9k_mib_stats *stats)
|
|
{
|
|
- stats->ackrcv_bad += REG_READ(ah, AR_ACK_FAIL);
|
|
- stats->rts_bad += REG_READ(ah, AR_RTS_FAIL);
|
|
- stats->fcs_bad += REG_READ(ah, AR_FCS_FAIL);
|
|
- stats->rts_good += REG_READ(ah, AR_RTS_OK);
|
|
- stats->beacons += REG_READ(ah, AR_BEACON_CNT);
|
|
+ u32 addr[5] = {AR_RTS_OK, AR_RTS_FAIL, AR_ACK_FAIL,
|
|
+ AR_FCS_FAIL, AR_BEACON_CNT};
|
|
+ u32 data[5];
|
|
+
|
|
+ REG_READ_MULTI(ah, &addr[0], &data[0], 5);
|
|
+ /* AR_RTS_OK */
|
|
+ stats->rts_good += data[0];
|
|
+ /* AR_RTS_FAIL */
|
|
+ stats->rts_bad += data[1];
|
|
+ /* AR_ACK_FAIL */
|
|
+ stats->ackrcv_bad += data[2];
|
|
+ /* AR_FCS_FAIL */
|
|
+ stats->fcs_bad += data[3];
|
|
+ /* AR_BEACON_CNT */
|
|
+ stats->beacons += data[4];
|
|
}
|
|
|
|
static void ath9k_ani_restart(struct ath_hw *ah)
|