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

[Stephen Rothwell]

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                    s...@canb.auug.org.au

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);

pgp_Sy5wxZeNv.pgp
Description: PGP signature