On Thu, 2013-12-05 at 17:05 +0100, Johannes Berg wrote: > On Thu, 2013-12-05 at 17:25 +0200, Luciano Coelho wrote: > > > +++ b/net/mac80211/util.c > > @@ -2498,7 +2498,6 @@ int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, > > ifmsh->pre_value++; > > put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */ > > pos += 2; > > - ifmsh->chsw_init = true; > > Where did this go? I'm asking mostly because mac80211.git has a patch > that changed this code so I'm wondering how to resolve the conflict ... This became the ifmsh->csa_role. ifmsh->chsw_init == true is now ifmsh->csa_role == IEEE80211_MESH_CSA_ROLE_INIT. -- Luca. ��.n��������+%������w��{.n�����{���zW����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f