On Tue, Dec 03, 2013 at 05:09:43PM +0100, Johannes Berg wrote: > > > diff --cc net/mac80211/util.c > > > index 9f9b9bd3fd44,06265d7f8cc3..000000000000 > > > --- a/net/mac80211/util.c > > > +++ b/net/mac80211/util.c > > > @@@ -2457,9 -2481,13 +2479,8 @@@ int ieee80211_send_action_csa(struct ie > > > WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; > > > put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */ > > > pos += 2; > > > - pre_value = cpu_to_le16(ifmsh->pre_value); > > > - memcpy(pos, &pre_value, 2); /* Precedence Value */ > > > - if (!ifmsh->pre_value) > > > - ifmsh->pre_value = 1; > > > - else > > > - ifmsh->pre_value++; > > > + put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */ > > > pos += 2; > > > - ifmsh->chsw_init = true; > > > } > > > > > > ieee80211_tx_skb(sdata, skb); > I think the above is correct, the pre_value assignment with 1/++ and > chsw_init moved into another function in Bob's patch. Bob? The quoted resolution looks right to me. But, I think the patch in question was actually Chun-yeow's so I'm not sure my opinion counts :) -- Bob Copeland %% www.bobcopeland.com -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
