From a95b1fd3366b8661e1a64c63e49f5273117a65bc Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 15 Jul 2012 19:53:31 +0200 Subject: [PATCH] --- yaml --- r: 315599 b: refs/heads/master c: 00f97b4fd578328a6a54d4e2c3cfa74c6c32683f h: refs/heads/master i: 315597: 50167f2d5358e61658e735beb69d71375345d534 315595: ec17d0b7417317dcc11234e0680f8a4ef2f7385c 315591: a1b7b2f06feb917e4ee7ca78da09884d66a5dbff 315583: 256e6f135e4a80986bac02c0bdf930aca507d184 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d3dd528b01af..bd4b88d648f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d9c7e3c82aaf40b9192e6482968a39b87427bf7 +refs/heads/master: 00f97b4fd578328a6a54d4e2c3cfa74c6c32683f diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c index 9c8e0d84c56b..ddb24bfc2737 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/hw.c +++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c @@ -671,10 +671,6 @@ static int __ath9k_hw_init(struct ath_hw *ah) if (!AR_SREV_9300_20_OR_LATER(ah)) ah->ani_function &= ~ATH9K_ANI_MRC_CCK; - /* disable ANI for 9340 */ - if (AR_SREV_9340(ah)) - ah->config.enable_ani = false; - ath9k_hw_init_mode_regs(ah); if (!ah->is_pciexpress)