Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

I bisected the problem I was having with ath9k STA configured for WPA
not being able to authenticate.  I'm using nohwcrypt=1, which may
be why no one else sees it.

According to bisect, this is the first bad commit:

commit 5519541d5a5f19893546883547e2f0f2e5934df7
Author: Felix Fietkau <nbd@openwrt.org>
Date:   Sun Apr 17 23:28:09 2011 +0200

     ath9k: fix powersave frame filtering/buffering in AP mode

     This patch fixes a long standing issue of pending packets in the queue being
     sent (and retransmitted many times) to sleeping stations.
     This was made worse by aggregation through driver-internal retransmitting
     of A-MDPU subframes.
     Previously the hardware tx filter was cleared unconditionally for every
     single packet - with this patch it uses the IEEE80211_TX_CTL_CLEAR_PS_FILT
     for unaggregated frames.
     A sta_notify driver op is added to stop aggregation for stations when they
     enter powersave mode. Subframes stay buffered inside the driver, to ensure
     that the BlockAck window keeps a sane state.
     Since the driver uses software aggregation, the clearing of the tx filter
     needs to be handled by the driver instead of mac80211 for aggregated frames.

     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
     Signed-off-by: John W. Linville <linville@tuxdriver.com>


I'll be happy to test patches, it seems very easy to reproduce on
my setup.

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Felix Fietkau]

On 2011-05-05 10:44 PM, Ben Greear wrote:
> I bisected the problem I was having with ath9k STA configured for WPA
> not being able to authenticate.  I'm using nohwcrypt=1, which may
> be why no one else sees it.
> 
> According to bisect, this is the first bad commit:
> 
> commit 5519541d5a5f19893546883547e2f0f2e5934df7
> Author: Felix Fietkau<nbd@openwrt.org>
> Date:   Sun Apr 17 23:28:09 2011 +0200
> 
>       ath9k: fix powersave frame filtering/buffering in AP mode
> 
>       This patch fixes a long standing issue of pending packets in the queue being
>       sent (and retransmitted many times) to sleeping stations.
>       This was made worse by aggregation through driver-internal retransmitting
>       of A-MDPU subframes.
>       Previously the hardware tx filter was cleared unconditionally for every
>       single packet - with this patch it uses the IEEE80211_TX_CTL_CLEAR_PS_FILT
>       for unaggregated frames.
>       A sta_notify driver op is added to stop aggregation for stations when they
>       enter powersave mode. Subframes stay buffered inside the driver, to ensure
>       that the BlockAck window keeps a sane state.
>       Since the driver uses software aggregation, the clearing of the tx filter
>       needs to be handled by the driver instead of mac80211 for aggregated frames.
> 
>       Signed-off-by: Felix Fietkau<nbd@openwrt.org>
>       Signed-off-by: John W. Linville<linville@tuxdriver.com>
> 
> 
> I'll be happy to test patches, it seems very easy to reproduce on
> my setup.
How about this?

--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1270,6 +1270,9 @@ ieee80211_tx_prepare(struct ieee80211_su
 		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
 	else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))
 		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
+	else if (sdata->vif.type != NL80211_IFTYPE_AP &&
+	         sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
+		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
 
 	hdrlen = ieee80211_hdrlen(hdr->frame_control);
 	if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) {

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

On 05/05/2011 02:03 PM, Felix Fietkau wrote:
> On 2011-05-05 10:44 PM, Ben Greear wrote:
>> I bisected the problem I was having with ath9k STA configured for WPA
>> not being able to authenticate.  I'm using nohwcrypt=1, which may
>> be why no one else sees it.

>> I'll be happy to test patches, it seems very easy to reproduce on
>> my setup.
> How about this?
>
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -1270,6 +1270,9 @@ ieee80211_tx_prepare(struct ieee80211_su
>   		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>   	else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))
>   		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
> +	else if (sdata->vif.type != NL80211_IFTYPE_AP&&
> +	         sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
> +		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>
>   	hdrlen = ieee80211_hdrlen(hdr->frame_control);
>   	if (skb->len>  hdrlen + sizeof(rfc1042_header) + 2) {

Yes, that seems to fix the problem.

Thanks for the quick fix!

Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

On 05/05/2011 02:15 PM, Ben Greear wrote:
> On 05/05/2011 02:03 PM, Felix Fietkau wrote:
>> On 2011-05-05 10:44 PM, Ben Greear wrote:
>>> I bisected the problem I was having with ath9k STA configured for WPA
>>> not being able to authenticate. I'm using nohwcrypt=1, which may
>>> be why no one else sees it.
>
>>> I'll be happy to test patches, it seems very easy to reproduce on
>>> my setup.
>> How about this?
>>
>> --- a/net/mac80211/tx.c
>> +++ b/net/mac80211/tx.c
>> @@ -1270,6 +1270,9 @@ ieee80211_tx_prepare(struct ieee80211_su
>> info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>> else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))
>> info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>> + else if (sdata->vif.type != NL80211_IFTYPE_AP&&
>> + sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
>> + info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>
>> hdrlen = ieee80211_hdrlen(hdr->frame_control);
>> if (skb->len> hdrlen + sizeof(rfc1042_header) + 2) {
>
> Yes, that seems to fix the problem.
>
> Thanks for the quick fix!

Well, that appeared to fix the problem on -rc1, but when I go
back to -rc6 and apply that patch, it still doesn't work.

Might be some other issue though...

Are you able to get STA to associate & athenticate on latest wireless-testing?

Thanks,
Ben

>
> Ben
>


-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Felix Fietkau]

On 2011-05-05 11:43 PM, Ben Greear wrote:
> On 05/05/2011 02:15 PM, Ben Greear wrote:
>>  On 05/05/2011 02:03 PM, Felix Fietkau wrote:
>>>  On 2011-05-05 10:44 PM, Ben Greear wrote:
>>>>  I bisected the problem I was having with ath9k STA configured for WPA
>>>>  not being able to authenticate. I'm using nohwcrypt=1, which may
>>>>  be why no one else sees it.
>>
>>>>  I'll be happy to test patches, it seems very easy to reproduce on
>>>>  my setup.
>>>  How about this?
>>>
>>>  --- a/net/mac80211/tx.c
>>>  +++ b/net/mac80211/tx.c
>>>  @@ -1270,6 +1270,9 @@ ieee80211_tx_prepare(struct ieee80211_su
>>>  info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>  else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))
>>>  info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>  + else if (sdata->vif.type != NL80211_IFTYPE_AP&&
>>>  + sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
>>>  + info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>
>>>  hdrlen = ieee80211_hdrlen(hdr->frame_control);
>>>  if (skb->len>  hdrlen + sizeof(rfc1042_header) + 2) {
>>
>>  Yes, that seems to fix the problem.
>>
>>  Thanks for the quick fix!
>
> Well, that appeared to fix the problem on -rc1, but when I go
> back to -rc6 and apply that patch, it still doesn't work.
>
> Might be some other issue though...
Odd. Please try bisecting by applying the patch for each test and 
reverting it before running git bisect again.

> Are you able to get STA to associate&  athenticate on latest wireless-testing?
I'll try it by making a new wireless-testing based compat-wireless.

- Felix

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

On 05/05/2011 02:54 PM, Felix Fietkau wrote:
> On 2011-05-05 11:43 PM, Ben Greear wrote:
>> On 05/05/2011 02:15 PM, Ben Greear wrote:
>>> On 05/05/2011 02:03 PM, Felix Fietkau wrote:
>>>> On 2011-05-05 10:44 PM, Ben Greear wrote:
>>>>> I bisected the problem I was having with ath9k STA configured for WPA
>>>>> not being able to authenticate. I'm using nohwcrypt=1, which may
>>>>> be why no one else sees it.
>>>
>>>>> I'll be happy to test patches, it seems very easy to reproduce on
>>>>> my setup.
>>>> How about this?
>>>>
>>>> --- a/net/mac80211/tx.c
>>>> +++ b/net/mac80211/tx.c
>>>> @@ -1270,6 +1270,9 @@ ieee80211_tx_prepare(struct ieee80211_su
>>>> info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>> else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))
>>>> info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>> + else if (sdata->vif.type != NL80211_IFTYPE_AP&&
>>>> + sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
>>>> + info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>>
>>>> hdrlen = ieee80211_hdrlen(hdr->frame_control);
>>>> if (skb->len> hdrlen + sizeof(rfc1042_header) + 2) {
>>>
>>> Yes, that seems to fix the problem.
>>>
>>> Thanks for the quick fix!
>>
>> Well, that appeared to fix the problem on -rc1, but when I go
>> back to -rc6 and apply that patch, it still doesn't work.
>>
>> Might be some other issue though...
> Odd. Please try bisecting by applying the patch for each test and
> reverting it before running git bisect again.

Unless I made a mistake, it's this patch that causes the next problem:

[greearb@build-32 linux.wt]$ git bisect bad
93ae2dd2230393566738a5f211ffbaa33b056d56 is the first bad commit
commit 93ae2dd2230393566738a5f211ffbaa33b056d56
Author: Felix Fietkau <nbd@openwrt.org>
Date:   Sun Apr 17 23:28:10 2011 +0200

     ath9k: assign keycache slots to unencrypted stations

Makes me wonder if I'm the only one crazy enough to actually use
wireless testing :P

Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Felix Fietkau]

On 2011-05-06 2:16 AM, Ben Greear wrote:
> On 05/05/2011 02:54 PM, Felix Fietkau wrote:
>>  On 2011-05-05 11:43 PM, Ben Greear wrote:
>>>  On 05/05/2011 02:15 PM, Ben Greear wrote:
>>>>  On 05/05/2011 02:03 PM, Felix Fietkau wrote:
>>>>>  On 2011-05-05 10:44 PM, Ben Greear wrote:
>>>>>>  I bisected the problem I was having with ath9k STA configured for WPA
>>>>>>  not being able to authenticate. I'm using nohwcrypt=1, which may
>>>>>>  be why no one else sees it.
>>>>
>>>>>>  I'll be happy to test patches, it seems very easy to reproduce on
>>>>>>  my setup.
>>>>>  How about this?
>>>>>
>>>>>  --- a/net/mac80211/tx.c
>>>>>  +++ b/net/mac80211/tx.c
>>>>>  @@ -1270,6 +1270,9 @@ ieee80211_tx_prepare(struct ieee80211_su
>>>>>  info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>>>  else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT))
>>>>>  info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>>>  + else if (sdata->vif.type != NL80211_IFTYPE_AP&&
>>>>>  + sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
>>>>>  + info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
>>>>>
>>>>>  hdrlen = ieee80211_hdrlen(hdr->frame_control);
>>>>>  if (skb->len>  hdrlen + sizeof(rfc1042_header) + 2) {
>>>>
>>>>  Yes, that seems to fix the problem.
>>>>
>>>>  Thanks for the quick fix!
>>>
>>>  Well, that appeared to fix the problem on -rc1, but when I go
>>>  back to -rc6 and apply that patch, it still doesn't work.
>>>
>>>  Might be some other issue though...
>>  Odd. Please try bisecting by applying the patch for each test and
>>  reverting it before running git bisect again.
> 
> Unless I made a mistake, it's this patch that causes the next problem:
> 
> [greearb@build-32 linux.wt]$ git bisect bad
> 93ae2dd2230393566738a5f211ffbaa33b056d56 is the first bad commit
> commit 93ae2dd2230393566738a5f211ffbaa33b056d56
> Author: Felix Fietkau<nbd@openwrt.org>
> Date:   Sun Apr 17 23:28:10 2011 +0200
> 
>       ath9k: assign keycache slots to unencrypted stations
> 
> Makes me wonder if I'm the only one crazy enough to actually use
> wireless testing :P
I use compat-wireless based on wireless-testing all the time, but in my
tests, I did not encounter the issues that you're reporting, no idea
why.

This should fix the second issue:

--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
 	struct ath_node *an = (struct ath_node *) sta->drv_priv;
 	struct ieee80211_key_conf ps_key = { };
 
+	if (vif->opmode != NL80211_IFTYPE_AP &&
+	    vif->opmode != NL80211_IFTYPE_AP_VLAN)
+		return 0;
+
 	ath_node_attach(sc, sta);
 	an->ps_key = ath_key_config(common, vif, sta, &ps_key);
 

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

On 05/05/2011 05:44 PM, Felix Fietkau wrote:

> This should fix the second issue:
>
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>   	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>   	struct ieee80211_key_conf ps_key = { };
>
> +	if (vif->opmode != NL80211_IFTYPE_AP&&
> +	    vif->opmode != NL80211_IFTYPE_AP_VLAN)
> +		return 0;
> +
>   	ath_node_attach(sc, sta);
>   	an->ps_key = ath_key_config(common, vif, sta,&ps_key);

This doesn't compile..appears there is no vif->opmode member?

Also, if you are trying to compare the hardware opmode, I'm not
sure that would be correct since you can be in AP mode and still
have stations.  Maybe I'm just confused though...

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Felix Fietkau]

On 2011-05-06 6:29 PM, Ben Greear wrote:
> On 05/05/2011 05:44 PM, Felix Fietkau wrote:
> 
>>  This should fix the second issue:
>>
>>  --- a/drivers/net/wireless/ath/ath9k/main.c
>>  +++ b/drivers/net/wireless/ath/ath9k/main.c
>>  @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>>    	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>>    	struct ieee80211_key_conf ps_key = { };
>>
>>  +	if (vif->opmode != NL80211_IFTYPE_AP&&
>>  +	    vif->opmode != NL80211_IFTYPE_AP_VLAN)
>>  +		return 0;
>>  +
>>    	ath_node_attach(sc, sta);
>>    	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
> 
> This doesn't compile..appears there is no vif->opmode member?
> 
> Also, if you are trying to compare the hardware opmode, I'm not
> sure that would be correct since you can be in AP mode and still
> have stations.  Maybe I'm just confused though...
I sent the wrong version of the patch, forgot to refresh it.
Here's the correct one:

--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
 	struct ath_node *an = (struct ath_node *) sta->drv_priv;
 	struct ieee80211_key_conf ps_key = { };
 
+	if (vif->type != NL80211_IFTYPE_AP &&
+	    vif->type != NL80211_IFTYPE_AP_VLAN)
+		return 0;
+
 	ath_node_attach(sc, sta);
 	an->ps_key = ath_key_config(common, vif, sta, &ps_key);
 

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

On 05/06/2011 09:51 AM, Felix Fietkau wrote:
> On 2011-05-06 6:29 PM, Ben Greear wrote:
>> On 05/05/2011 05:44 PM, Felix Fietkau wrote:
>>
>>>   This should fix the second issue:
>>>
>>>   --- a/drivers/net/wireless/ath/ath9k/main.c
>>>   +++ b/drivers/net/wireless/ath/ath9k/main.c
>>>   @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>>>     	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>>>     	struct ieee80211_key_conf ps_key = { };
>>>
>>>   +	if (vif->opmode != NL80211_IFTYPE_AP&&
>>>   +	    vif->opmode != NL80211_IFTYPE_AP_VLAN)
>>>   +		return 0;
>>>   +
>>>     	ath_node_attach(sc, sta);
>>>     	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
>>
>> This doesn't compile..appears there is no vif->opmode member?
>>
>> Also, if you are trying to compare the hardware opmode, I'm not
>> sure that would be correct since you can be in AP mode and still
>> have stations.  Maybe I'm just confused though...
> I sent the wrong version of the patch, forgot to refresh it.
> Here's the correct one:
>
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>   	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>   	struct ieee80211_key_conf ps_key = { };
>
> +	if (vif->type != NL80211_IFTYPE_AP&&
> +	    vif->type != NL80211_IFTYPE_AP_VLAN)
> +		return 0;
> +
>   	ath_node_attach(sc, sta);
>   	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
>

I think maybe you want that logic inserted below the ath_node_attach?

I tried it as you have it above, guessing that is what you meant, and
it crashed with null pointer exception....

Compiling with the logic below node_attach now...

Ben



-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Ben Greear]

On 05/06/2011 09:51 AM, Felix Fietkau wrote:
> On 2011-05-06 6:29 PM, Ben Greear wrote:
>> On 05/05/2011 05:44 PM, Felix Fietkau wrote:
>>
>>>   This should fix the second issue:
>>>
>>>   --- a/drivers/net/wireless/ath/ath9k/main.c
>>>   +++ b/drivers/net/wireless/ath/ath9k/main.c
>>>   @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>>>     	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>>>     	struct ieee80211_key_conf ps_key = { };
>>>
>>>   +	if (vif->opmode != NL80211_IFTYPE_AP&&
>>>   +	    vif->opmode != NL80211_IFTYPE_AP_VLAN)
>>>   +		return 0;
>>>   +
>>>     	ath_node_attach(sc, sta);
>>>     	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
>>
>> This doesn't compile..appears there is no vif->opmode member?
>>
>> Also, if you are trying to compare the hardware opmode, I'm not
>> sure that would be correct since you can be in AP mode and still
>> have stations.  Maybe I'm just confused though...
> I sent the wrong version of the patch, forgot to refresh it.
> Here's the correct one:
>
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>   	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>   	struct ieee80211_key_conf ps_key = { };
>
> +	if (vif->type != NL80211_IFTYPE_AP&&
> +	    vif->type != NL80211_IFTYPE_AP_VLAN)
> +		return 0;
> +
>   	ath_node_attach(sc, sta);
>   	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
>


This patch appears to fix things.  I'll let you send it proper
for submittal since you have a better idea of what it's doing:

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 3de115d..3d999b7 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1778,6 +1778,11 @@ static int ath9k_sta_add(struct ieee80211_hw *hw,
         struct ieee80211_key_conf ps_key = { };

         ath_node_attach(sc, sta);
+
+       if (vif->type != NL80211_IFTYPE_AP &&
+           vif->type != NL80211_IFTYPE_AP_VLAN)
+               return 0;
+
         an->ps_key = ath_key_config(common, vif, sta, &ps_key);

         return 0;


Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: Bisected: ath9k: fix powersave frame filtering/buffering in AP mode broke STA association.

[Felix Fietkau]

On 2011-05-06 6:58 PM, Ben Greear wrote:
> On 05/06/2011 09:51 AM, Felix Fietkau wrote:
>>  On 2011-05-06 6:29 PM, Ben Greear wrote:
>>>  On 05/05/2011 05:44 PM, Felix Fietkau wrote:
>>>
>>>>    This should fix the second issue:
>>>>
>>>>    --- a/drivers/net/wireless/ath/ath9k/main.c
>>>>    +++ b/drivers/net/wireless/ath/ath9k/main.c
>>>>    @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>>>>      	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>>>>      	struct ieee80211_key_conf ps_key = { };
>>>>
>>>>    +	if (vif->opmode != NL80211_IFTYPE_AP&&
>>>>    +	    vif->opmode != NL80211_IFTYPE_AP_VLAN)
>>>>    +		return 0;
>>>>    +
>>>>      	ath_node_attach(sc, sta);
>>>>      	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
>>>
>>>  This doesn't compile..appears there is no vif->opmode member?
>>>
>>>  Also, if you are trying to compare the hardware opmode, I'm not
>>>  sure that would be correct since you can be in AP mode and still
>>>  have stations.  Maybe I'm just confused though...
>>  I sent the wrong version of the patch, forgot to refresh it.
>>  Here's the correct one:
>>
>>  --- a/drivers/net/wireless/ath/ath9k/main.c
>>  +++ b/drivers/net/wireless/ath/ath9k/main.c
>>  @@ -1722,6 +1722,10 @@ static int ath9k_sta_add(struct ieee8021
>>    	struct ath_node *an = (struct ath_node *) sta->drv_priv;
>>    	struct ieee80211_key_conf ps_key = { };
>>
>>  +	if (vif->type != NL80211_IFTYPE_AP&&
>>  +	    vif->type != NL80211_IFTYPE_AP_VLAN)
>>  +		return 0;
>>  +
>>    	ath_node_attach(sc, sta);
>>    	an->ps_key = ath_key_config(common, vif, sta,&ps_key);
>>
>
>
> This patch appears to fix things.  I'll let you send it proper
> for submittal since you have a better idea of what it's doing:
OK, thanks. I'll combine this with another ath9k patch to replace the 
rejected mac80211 PS filter patch and submit that for 2.6.39.

- Felix