> +static int > +ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) > +{ > + struct beacon_data *bcn; > + int head_len, tail_len; > + struct sk_buff *skb; > + struct ieee80211_mgmt *mgmt; > + struct ieee80211_chanctx_conf *chanctx_conf; > + enum ieee80211_band band; > + u8 *pos; > + struct ieee80211_sub_if_data *sdata; > + int hdr_len = offsetof(struct ieee80211_mgmt, u.beacon) + > + sizeof(mgmt->u.beacon); > + > + sdata = container_of(ifmsh, struct ieee80211_sub_if_data, u.mesh); > + rcu_read_lock(); > + chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); > + band = chanctx_conf->def.chan->band; > + rcu_read_unlock(); > + > + RCU_INIT_POINTER(ifmsh->beacon, NULL); > + synchronize_rcu(); That doesn't seem right? Why force to NULL and synchronize, instead of just building an update and overwriting the old beacon with the new, using kfree_rcu() to get rid of the old afterwards? synchronize_rcu() is quite expensive (might take hundreds of milliseconds.) Also, doesn't this just leak the old one? > + /* need an skb for IE builders to operate on */ > + skb = dev_alloc_skb(max(head_len, tail_len)); Heh. Might consider changing the IE builder functions? > +static int > +ieee80211_mesh_rebuild_beacon(struct ieee80211_if_mesh *ifmsh) > +{ > + struct ieee80211_sub_if_data *sdata; > + sdata = container_of(ifmsh, struct ieee80211_sub_if_data, u.mesh); > + > + rcu_read_lock(); > + kfree(rcu_dereference(ifmsh->beacon)); > + rcu_read_unlock(); > + > + if (WARN_ON(ieee80211_mesh_build_beacon(ifmsh))) { The warning is probably not a good idea since it's really for allocation failures only which already print long messages. > + mpl_dbg(sdata, "couldn't rebuild mesh beacon, stopping!\n"); > + ieee80211_stop_mesh(sdata); I'm not sure that's such a good idea? Nothing in userspace would expect to randomly stop the mesh. > + return -1; Why not have a proper error code and propagate it properly? :) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html