Re: [PATCH 1/3] mac80211: move mesh sync beacon handler into neighbour_update

[Marco Porsch <marco@cozybit.com>]

Hi,

On 02/15/2013 01:42 PM, Bob Copeland wrote:
> On Fri, Feb 15, 2013 at 07:40:46AM -0500, Bob Copeland wrote:
>>> I don't think you should drop this comment; also why not just address
>>> it? There's a timestamp in rx_status that should be the correct one for
>>> ath9k (which is pretty much all this seems to work on anyway :) )
>>
>> The comment is just moved?  Mesh already uses rx_status->mactime, if
>> the driver supplies it, which the comment says :)
>
> Oh I see - you are saying not to drop the comment about rcu locking.

 > diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
 > index f7526e5..fe6fc22 100644
 > --- a/net/mac80211/mesh_plink.c
 > +++ b/net/mac80211/mesh_plink.c
 > @@ -488,13 +489,19 @@ mesh_sta_info_get(struct ieee80211_sub_if_data 
*sdata,
 >    * Initiates peering if appropriate.
 >    */
 >   void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
 > -			   u8 *hw_addr,
 > -			   struct ieee802_11_elems *elems)
 > +			   struct ieee80211_mgmt *mgmt,
 > +			   struct ieee802_11_elems *elems,
 > +			   struct ieee80211_rx_status *rx_status)
 >   {
 > +	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
 >   	struct sta_info *sta;
 >   	u32 changed = 0;
 > +	u64 tsf;
 >
 > -	sta = mesh_sta_info_get(sdata, hw_addr, elems);
 > +	/* get tsf before entering rcu-read section */

The comment about RCU lock moved here.

 > +	tsf = drv_get_tsf(sdata->local, sdata);
 > +
 > +	sta = mesh_sta_info_get(sdata, mgmt->sa, elems);
 >   	if (!sta)
 >   		goto out;
 >

--Marco