Re: [PATCH] mac80211: Add WME information element for IBSS

[Bruno Randolf <br1@einfach.org>]

On Thu September 16 2010 18:37:33 Johannes Berg wrote:
> On Thu, 2010-09-16 at 17:34 +0900, Bruno Randolf wrote:
> > Enable WME QoS in IBSS mode by adding a WME information element to
> > beacons and probe respones and by checking for it and marking stations
> > as WME capable if it is present.
> > 
> >  			rcu_read_unlock();
> > 
> > -			ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
> > -					       supp_rates, GFP_KERNEL);
> > +
> > +			sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
> > +					mgmt->sa, supp_rates, GFP_KERNEL);
> > 
> >  		}
> > 
> > +		if (sta && elems->wmm_info)
> > +			set_sta_flags(sta, WLAN_STA_WME);
> 
> NACK, this is obviously racy.

sorry for the late reply.

better like this?

@@ -291,11 +304,16 @@ static void ieee80211_rx_bss_info(struct 
ieee80211_sub_if_data *sdata,
 #endif
                                rate_control_rate_init(sta);
                        }
+                       if (elems->wmm_info)
+                               set_sta_flags(sta, WLAN_STA_WME);
                        rcu_read_unlock();
                } else {
                        rcu_read_unlock();
-                       ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
-                                              supp_rates, GFP_KERNEL);
+
+                       sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
+                                       mgmt->sa, supp_rates, GFP_KERNEL);
+                       if (sta && elems->wmm_info)
+                               set_sta_flags(sta, WLAN_STA_WME);
                }
        }

if not, i don't get it... could you explain how it should be done properly?

thanks,
bruno