Re: linux-next: manual merge of the wireless-next tree with thewireless tree

[John W. Linville]

On Tue, Dec 03, 2013 at 11:20:32AM +1100, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless-next tree got a conflict in
> net/mac80211/util.c between commit 3f718fd8401d ("mac80211: fix the mesh
> channel switch support") from the wireless tree and commit ca91dc97b8a0
> ("mac80211: use put_unaligned_le16 for precedence value in mesh") from
> the wireless-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> 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);

This differs from how I resolved the conflict when merging in wireless-testing...

Johannes, could you comment on which (if either) of these options is correct?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/