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 ... 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