RE: [PATCH 4/4] ath9k_hw: do not limit initial tx power to 20 dbm

 

-----Original Message-----
From: Mohammed Shafi [mailto:shafi.wireless@gmail.com] 
Sent: Friday, October 19, 2012 7:21 AM
To: Ambrus Oláh
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH 4/4] ath9k_hw: do not limit initial tx power to 20 dbm

On Thu, Oct 18, 2012 at 4:14 AM, Ambrus Oláh [off-list ref] wrote:

Felix Fietkau <nbd@...> writes:

quoted

When testing for tx power, bypass the default limits.

Signed-off-by: Felix Fietkau <redacted>
---
 drivers/net/wireless/ath/ath9k/hw.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/hw.c

b/drivers/net/wireless/ath/ath9k/hw.c

quoted

index 8006ce0..a2e5763 100644

--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c

@@ -2432,15 +2432,18 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw 

*ah, u32

limit, bool test)

quoted

      struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
      struct ath9k_channel *chan = ah->curchan;
      struct ieee80211_channel *channel = chan->chan;
+     int reg_pwr = min_t(int, MAX_RATE_POWER, regulatory->power_limit);
+     int chan_pwr = channel->max_power * 2;
+
+     if (test)
+             reg_pwr = chan_pwr = MAX_RATE_POWER;

      regulatory->power_limit = min(limit, (u32) MAX_RATE_POWER);

      ah->eep_ops->set_txpower(ah, chan,
                               ath9k_regd_get_ctl(regulatory, chan),
                               channel->max_antenna_gain * 2,
-                              channel->max_power * 2,
-                              min((u32) MAX_RATE_POWER,
-                              (u32) regulatory->power_limit), test);
+                              chan_pwr, reg_pwr, test);
 }
 EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit);

Dear Mr. Fietkau,

I have tried to apply your patch on
http://www.orbit-lab.org/kernel/compat-wireless-3-stable/v3.3/compat-w
ireless-3.3-2-n.tar.bz2

I get the following error:

patch -p1 < ath9k_txpower.patch
patching file drivers/net/wireless/ath/ath9k/hw.c
Hunk #1 FAILED at 2432.
patch unexpectedly ends in middle of line
1 out of 1 hunk FAILED -- saving rejects to file 
drivers/net/wireless/ath/ath9k/hw.c.rej
patch unexpectedly ends in middle of line

Could you support me with a patch tuned to the above compat-wireless?

try applying over the latest
http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-1
0-03.tar.bz2

ideally these patches are based on wireless-testing tree and you goto apply
into it, and do kerenel/module compilation.

http://wireless.kernel.org/en/developers/Documentation/git-guide#Cloning_lat
est_wireless-testing

Yours sincerelly,

Ambrus Oláh

--
To unsubscribe from this list: send the line "unsubscribe 
linux-wireless" in the body of a message to majordomo@vger.kernel.org 
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
thanks,
Shafi

Dear Mr. Shafi,

I have tested the patch above on
http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-1
0-03.tar.bz2 with the following results:

~/compat-wireless-2012-10-03# patch -p1 < ath9k_txpower.patch
patching file drivers/net/wireless/ath/ath9k/hw.c
Hunk #1 FAILED at 2432.
patch unexpectedly ends in middle of line
1 out of 1 hunk FAILED -- saving rejects to file
drivers/net/wireless/ath/ath9k/hw.c.rej
patch unexpectedly ends in middle of line

I have also tried to test the patch with the latest compat-wireless source
found at:
http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-1
0-20.tar.bz2

I get the same error:

~/compat-wireless-2012-10-20# patch -p1 < ath9k_txpower.patch
patching file drivers/net/wireless/ath/ath9k/hw.c
Hunk #1 FAILED at 2432.
patch unexpectedly ends in middle of line
1 out of 1 hunk FAILED -- saving rejects to file
drivers/net/wireless/ath/ath9k/hw.c.rej
patch unexpectedly ends in middle of line

Could you examine the attached patch file why it is comlaining twice about
"patch unexpectedly ends in middle of line" ?

Yours sincerelly,

Ambrus Oláh