Re: [PATCH 2/2] mac80211: use accessor functions to set sta->_flags

2017-01-25 Thread Johannes Berg
On Wed, 2017-01-25 at 09:55 +0100, Amadeusz Slawinski wrote:
> And yes I did. Somehow managed to ignore those warnings though, sorry
> about that.

:)
That was intentional so nobody changing mac80211 in the future will
accidentally play with those flags through the normal accessors.

> Rechecked with just first patch and it should still be good. Please
> ignore this one ;)

Yeah, I still have that one pending, no worries :)

johannes


Re: [PATCH 2/2] mac80211: use accessor functions to set sta->_flags

2017-01-25 Thread Amadeusz Slawinski
And yes I did. Somehow managed to ignore those warnings though, sorry
about that.
Rechecked with just first patch and it should still be good. Please
ignore this one ;)

On 24 January 2017 at 16:44, Johannes Berg  wrote:
> On Tue, 2017-01-24 at 16:42 +0100, Amadeusz Sławiński wrote:
>> cleanup patch to make use of set_sta_flag()/clear_sta_flag() in
>> places
>> where we access sta->_flags
>>
>> Signed-off-by: Amadeusz Sławiński 
>> ---
>>  net/mac80211/sta_info.c | 12 ++--
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
>> index b6cfcf0..6c9cc2f 100644
>> --- a/net/mac80211/sta_info.c
>> +++ b/net/mac80211/sta_info.c
>> @@ -1855,13 +1855,13 @@ int sta_info_move_state(struct sta_info *sta,
>>   switch (new_state) {
>>   case IEEE80211_STA_NONE:
>>   if (sta->sta_state == IEEE80211_STA_AUTH)
>> - clear_bit(WLAN_STA_AUTH, &sta->_flags);
>> + clear_sta_flag(sta, WLAN_STA_AUTH);
>
> You should try to run this patch sometime :)
>
> johannes


Re: [PATCH 2/2] mac80211: use accessor functions to set sta->_flags

2017-01-24 Thread Johannes Berg
On Tue, 2017-01-24 at 16:42 +0100, Amadeusz Sławiński wrote:
> cleanup patch to make use of set_sta_flag()/clear_sta_flag() in
> places
> where we access sta->_flags
> 
> Signed-off-by: Amadeusz Sławiński 
> ---
>  net/mac80211/sta_info.c | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
> index b6cfcf0..6c9cc2f 100644
> --- a/net/mac80211/sta_info.c
> +++ b/net/mac80211/sta_info.c
> @@ -1855,13 +1855,13 @@ int sta_info_move_state(struct sta_info *sta,
>   switch (new_state) {
>   case IEEE80211_STA_NONE:
>   if (sta->sta_state == IEEE80211_STA_AUTH)
> - clear_bit(WLAN_STA_AUTH, &sta->_flags);
> + clear_sta_flag(sta, WLAN_STA_AUTH);

You should try to run this patch sometime :)

johannes


[PATCH 2/2] mac80211: use accessor functions to set sta->_flags

2017-01-24 Thread Amadeusz Sławiński
cleanup patch to make use of set_sta_flag()/clear_sta_flag() in places
where we access sta->_flags

Signed-off-by: Amadeusz Sławiński 
---
 net/mac80211/sta_info.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index b6cfcf0..6c9cc2f 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1855,13 +1855,13 @@ int sta_info_move_state(struct sta_info *sta,
switch (new_state) {
case IEEE80211_STA_NONE:
if (sta->sta_state == IEEE80211_STA_AUTH)
-   clear_bit(WLAN_STA_AUTH, &sta->_flags);
+   clear_sta_flag(sta, WLAN_STA_AUTH);
break;
case IEEE80211_STA_AUTH:
if (sta->sta_state == IEEE80211_STA_NONE) {
-   set_bit(WLAN_STA_AUTH, &sta->_flags);
+   set_sta_flag(sta, WLAN_STA_AUTH);
} else if (sta->sta_state == IEEE80211_STA_ASSOC) {
-   clear_bit(WLAN_STA_ASSOC, &sta->_flags);
+   clear_sta_flag(sta, WLAN_STA_ASSOC);
ieee80211_recalc_min_chandef(sta->sdata);
if (!sta->sta.support_p2p_ps)
ieee80211_recalc_p2p_go_ps_allowed(sta->sdata);
@@ -1869,13 +1869,13 @@ int sta_info_move_state(struct sta_info *sta,
break;
case IEEE80211_STA_ASSOC:
if (sta->sta_state == IEEE80211_STA_AUTH) {
-   set_bit(WLAN_STA_ASSOC, &sta->_flags);
+   set_sta_flag(sta, WLAN_STA_ASSOC);
ieee80211_recalc_min_chandef(sta->sdata);
if (!sta->sta.support_p2p_ps)
ieee80211_recalc_p2p_go_ps_allowed(sta->sdata);
} else if (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
ieee80211_vif_dec_num_mcast(sta->sdata);
-   clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+   clear_sta_flag(sta, WLAN_STA_AUTHORIZED);
ieee80211_clear_fast_xmit(sta);
ieee80211_clear_fast_rx(sta);
}
@@ -1883,7 +1883,7 @@ int sta_info_move_state(struct sta_info *sta,
case IEEE80211_STA_AUTHORIZED:
if (sta->sta_state == IEEE80211_STA_ASSOC) {
ieee80211_vif_inc_num_mcast(sta->sdata);
-   set_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+   set_sta_flag(sta, WLAN_STA_AUTHORIZED);
ieee80211_check_fast_xmit(sta);
ieee80211_check_fast_rx(sta);
}
-- 
1.9.1