* [PATCH] ath9k: cleanup few redundant macros
@ 2011-03-24 9:06 Mohammed Shafi Shajakhan
2011-03-24 9:38 ` Sujith
0 siblings, 1 reply; 6+ messages in thread
From: Mohammed Shafi Shajakhan @ 2011-03-24 9:06 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, lrodriguez, Mohammed Shafi Shajakhan
From: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
---
drivers/net/wireless/ath/ath9k/ath9k.h | 4 ----
drivers/net/wireless/ath/ath9k/common.c | 2 +-
drivers/net/wireless/ath/ath9k/mac.c | 2 --
3 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 099bd41..24b747c 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -120,13 +120,11 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
/* RX / TX */
/***********/
-#define ATH_MAX_ANTENNA 3
#define ATH_RXBUF 512
#define ATH_TXBUF 512
#define ATH_TXBUF_RESERVE 5
#define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
#define ATH_TXMAXTRY 13
-#define ATH_MGT_TXMAXTRY 4
#define TID_TO_WME_AC(_tid) \
((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \
@@ -688,8 +686,6 @@ void ath9k_ps_restore(struct ath_softc *sc);
u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);
-void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
-
void ath_start_rfkill_poll(struct ath_softc *sc);
extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
index 615e682..16ba8c6 100644
--- a/drivers/net/wireless/ath/ath9k/common.c
+++ b/drivers/net/wireless/ath/ath9k/common.c
@@ -116,7 +116,7 @@ void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
if (chan->band == IEEE80211_BAND_2GHZ) {
ichan->chanmode = CHANNEL_G;
- ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM | CHANNEL_G;
+ ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;
} else {
ichan->chanmode = CHANNEL_A;
ichan->channelFlags = CHANNEL_5GHZ | CHANNEL_OFDM;
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 562257a..ffefaf1 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -754,7 +754,6 @@ EXPORT_SYMBOL(ath9k_hw_abortpcurecv);
bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
{
#define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */
-#define AH_RX_TIME_QUANTUM 100 /* usec */
struct ath_common *common = ath9k_hw_common(ah);
int i;
@@ -778,7 +777,6 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
return true;
}
-#undef AH_RX_TIME_QUANTUM
#undef AH_RX_STOP_DMA_TIMEOUT
}
EXPORT_SYMBOL(ath9k_hw_stopdmarecv);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ath9k: cleanup few redundant macros
2011-03-24 9:06 [PATCH] ath9k: cleanup few redundant macros Mohammed Shafi Shajakhan
@ 2011-03-24 9:38 ` Sujith
2011-03-24 9:46 ` Mohammed Shafi
0 siblings, 1 reply; 6+ messages in thread
From: Sujith @ 2011-03-24 9:38 UTC (permalink / raw)
To: Mohammed Shafi Shajakhan; +Cc: linville, linux-wireless, lrodriguez
Mohammed Shafi Shajakhan wrote:
> From: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
>
> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
> ---
> drivers/net/wireless/ath/ath9k/ath9k.h | 4 ----
> drivers/net/wireless/ath/ath9k/common.c | 2 +-
> drivers/net/wireless/ath/ath9k/mac.c | 2 --
> 3 files changed, 1 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
> index 099bd41..24b747c 100644
> --- a/drivers/net/wireless/ath/ath9k/ath9k.h
> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
> @@ -120,13 +120,11 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
> /* RX / TX */
> /***********/
>
> -#define ATH_MAX_ANTENNA 3
> #define ATH_RXBUF 512
> #define ATH_TXBUF 512
> #define ATH_TXBUF_RESERVE 5
> #define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
> #define ATH_TXMAXTRY 13
> -#define ATH_MGT_TXMAXTRY 4
>
> #define TID_TO_WME_AC(_tid) \
> ((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \
> @@ -688,8 +686,6 @@ void ath9k_ps_restore(struct ath_softc *sc);
>
> u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);
>
> -void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
> -
> void ath_start_rfkill_poll(struct ath_softc *sc);
> extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
> void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
> diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
> index 615e682..16ba8c6 100644
> --- a/drivers/net/wireless/ath/ath9k/common.c
> +++ b/drivers/net/wireless/ath/ath9k/common.c
> @@ -116,7 +116,7 @@ void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
>
> if (chan->band == IEEE80211_BAND_2GHZ) {
> ichan->chanmode = CHANNEL_G;
> - ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM | CHANNEL_G;
> + ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;
There's a reason for this: 8813262ea79acf9daa0e03901bdfe93db4dc4ca5
If channel handling has been cleaned up since then, this can be removed.
Sujith
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ath9k: cleanup few redundant macros
2011-03-24 9:38 ` Sujith
@ 2011-03-24 9:46 ` Mohammed Shafi
2011-03-24 9:48 ` Mohammed Shafi
2011-03-24 10:02 ` Sujith
0 siblings, 2 replies; 6+ messages in thread
From: Mohammed Shafi @ 2011-03-24 9:46 UTC (permalink / raw)
To: Sujith
Cc: Mohammed Shajakhan, linville@tuxdriver.com,
linux-wireless@vger.kernel.org, Luis Rodriguez
On Thursday 24 March 2011 03:08 PM, Sujith wrote:
> Mohammed Shafi Shajakhan wrote:
>
>> From: Mohammed Shafi Shajakhan<mshajakhan@atheros.com>
>>
>> Signed-off-by: Mohammed Shafi Shajakhan<mshajakhan@atheros.com>
>> ---
>> drivers/net/wireless/ath/ath9k/ath9k.h | 4 ----
>> drivers/net/wireless/ath/ath9k/common.c | 2 +-
>> drivers/net/wireless/ath/ath9k/mac.c | 2 --
>> 3 files changed, 1 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
>> index 099bd41..24b747c 100644
>> --- a/drivers/net/wireless/ath/ath9k/ath9k.h
>> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
>> @@ -120,13 +120,11 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
>> /* RX / TX */
>> /***********/
>>
>> -#define ATH_MAX_ANTENNA 3
>> #define ATH_RXBUF 512
>> #define ATH_TXBUF 512
>> #define ATH_TXBUF_RESERVE 5
>> #define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
>> #define ATH_TXMAXTRY 13
>> -#define ATH_MGT_TXMAXTRY 4
>>
>> #define TID_TO_WME_AC(_tid) \
>> ((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \
>> @@ -688,8 +686,6 @@ void ath9k_ps_restore(struct ath_softc *sc);
>>
>> u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);
>>
>> -void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
>> -
>> void ath_start_rfkill_poll(struct ath_softc *sc);
>> extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
>> void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
>> diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
>> index 615e682..16ba8c6 100644
>> --- a/drivers/net/wireless/ath/ath9k/common.c
>> +++ b/drivers/net/wireless/ath/ath9k/common.c
>> @@ -116,7 +116,7 @@ void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
>>
>> if (chan->band == IEEE80211_BAND_2GHZ) {
>> ichan->chanmode = CHANNEL_G;
>> - ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM | CHANNEL_G;
>> + ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;
>>
> There's a reason for this: 8813262ea79acf9daa0e03901bdfe93db4dc4ca5
> If channel handling has been cleaned up since then, this can be removed.
>
Oh Ok thanks, I will resend the patch without that change.
but anyway CHANNEL_G is defined as (CHANNEL_2GHZ|CHANNEL_OFDM).
Please tell me what I am missing.
> Sujith
> .
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ath9k: cleanup few redundant macros
2011-03-24 9:46 ` Mohammed Shafi
@ 2011-03-24 9:48 ` Mohammed Shafi
2011-03-24 10:02 ` Sujith
1 sibling, 0 replies; 6+ messages in thread
From: Mohammed Shafi @ 2011-03-24 9:48 UTC (permalink / raw)
To: Mohammed Shajakhan
Cc: Sujith, linville@tuxdriver.com, linux-wireless@vger.kernel.org,
Luis Rodriguez
On Thursday 24 March 2011 03:16 PM, Mohammed Shajakhan wrote:
> On Thursday 24 March 2011 03:08 PM, Sujith wrote:
>
>> Mohammed Shafi Shajakhan wrote:
>>
>>
>>> From: Mohammed Shafi Shajakhan<mshajakhan@atheros.com>
>>>
>>> Signed-off-by: Mohammed Shafi Shajakhan<mshajakhan@atheros.com>
>>> ---
>>> drivers/net/wireless/ath/ath9k/ath9k.h | 4 ----
>>> drivers/net/wireless/ath/ath9k/common.c | 2 +-
>>> drivers/net/wireless/ath/ath9k/mac.c | 2 --
>>> 3 files changed, 1 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
>>> index 099bd41..24b747c 100644
>>> --- a/drivers/net/wireless/ath/ath9k/ath9k.h
>>> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
>>> @@ -120,13 +120,11 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
>>> /* RX / TX */
>>> /***********/
>>>
>>> -#define ATH_MAX_ANTENNA 3
>>> #define ATH_RXBUF 512
>>> #define ATH_TXBUF 512
>>> #define ATH_TXBUF_RESERVE 5
>>> #define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
>>> #define ATH_TXMAXTRY 13
>>> -#define ATH_MGT_TXMAXTRY 4
>>>
>>> #define TID_TO_WME_AC(_tid) \
>>> ((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \
>>> @@ -688,8 +686,6 @@ void ath9k_ps_restore(struct ath_softc *sc);
>>>
>>> u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);
>>>
>>> -void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
>>> -
>>> void ath_start_rfkill_poll(struct ath_softc *sc);
>>> extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
>>> void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
>>> diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
>>> index 615e682..16ba8c6 100644
>>> --- a/drivers/net/wireless/ath/ath9k/common.c
>>> +++ b/drivers/net/wireless/ath/ath9k/common.c
>>> @@ -116,7 +116,7 @@ void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
>>>
>>> if (chan->band == IEEE80211_BAND_2GHZ) {
>>> ichan->chanmode = CHANNEL_G;
>>> - ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM | CHANNEL_G;
>>> + ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;
>>>
>>>
>> There's a reason for this: 8813262ea79acf9daa0e03901bdfe93db4dc4ca5
>> If channel handling has been cleaned up since then, this can be removed.
>>
>>
>>
> Oh Ok thanks, I will resend the patch without that change.
> but anyway CHANNEL_G is defined as (CHANNEL_2GHZ|CHANNEL_OFDM).
> Please tell me what I am missing.
>
Now this change is correct?
>> Sujith
>> .
>>
>>
>>
> .
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ath9k: cleanup few redundant macros
2011-03-24 9:46 ` Mohammed Shafi
2011-03-24 9:48 ` Mohammed Shafi
@ 2011-03-24 10:02 ` Sujith
2011-03-24 10:10 ` Mohammed Shafi
1 sibling, 1 reply; 6+ messages in thread
From: Sujith @ 2011-03-24 10:02 UTC (permalink / raw)
To: Mohammed Shafi
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
Luis Rodriguez
Mohammed Shafi wrote:
> > There's a reason for this: 8813262ea79acf9daa0e03901bdfe93db4dc4ca5
> > If channel handling has been cleaned up since then, this can be removed.
> >
> Oh Ok thanks, I will resend the patch without that change.
> but anyway CHANNEL_G is defined as (CHANNEL_2GHZ|CHANNEL_OFDM).
Commit 8813262ea79acf9daa0e03901bdfe93db4dc4ca5 doesn't make much sense.
Your change looks correct.
Sujith
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ath9k: cleanup few redundant macros
2011-03-24 10:02 ` Sujith
@ 2011-03-24 10:10 ` Mohammed Shafi
0 siblings, 0 replies; 6+ messages in thread
From: Mohammed Shafi @ 2011-03-24 10:10 UTC (permalink / raw)
To: Sujith
Cc: Mohammed Shajakhan, linville@tuxdriver.com,
linux-wireless@vger.kernel.org, Luis Rodriguez
On Thursday 24 March 2011 03:32 PM, Sujith wrote:
> Mohammed Shafi wrote:
>
>>> There's a reason for this: 8813262ea79acf9daa0e03901bdfe93db4dc4ca5
>>> If channel handling has been cleaned up since then, this can be removed.
>>>
>>>
>> Oh Ok thanks, I will resend the patch without that change.
>> but anyway CHANNEL_G is defined as (CHANNEL_2GHZ|CHANNEL_OFDM).
>>
> Commit 8813262ea79acf9daa0e03901bdfe93db4dc4ca5 doesn't make much sense.
> Your change looks correct.
>
Ok Sujith, thanks for the review.
> Sujith
> .
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-24 10:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-24 9:06 [PATCH] ath9k: cleanup few redundant macros Mohammed Shafi Shajakhan
2011-03-24 9:38 ` Sujith
2011-03-24 9:46 ` Mohammed Shafi
2011-03-24 9:48 ` Mohammed Shafi
2011-03-24 10:02 ` Sujith
2011-03-24 10:10 ` Mohammed Shafi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.