Commit ca91dc97 authored by Chun-Yeow Yeoh's avatar Chun-Yeow Yeoh Committed by Johannes Berg
Browse files

mac80211: use put_unaligned_le16 for precedence value in mesh 



use put_unaligned_le16 for precedence value in mesh
channel switch support

Signed-off-by: default avatarChun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3751c4ed

net/mac80211/mesh.c

+1 −4
Original line number Diff line number Diff line
@@ -674,8 +674,6 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 
	rcu_read_lock();

	csa = rcu_dereference(ifmsh->csa);

	if (csa) {

		__le16 pre_value;



		pos = skb_put(skb, 13);

		memset(pos, 0, 13);

		*pos++ = WLAN_EID_CHANNEL_SWITCH;
@@ -697,8 +695,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 
			  WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00;

		put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos);

		pos += 2;

		pre_value = cpu_to_le16(ifmsh->pre_value);

		memcpy(pos, &pre_value, 2);

		put_unaligned_le16(ifmsh->pre_value, pos);

		pos += 2;

	}

	rcu_read_unlock();

net/mac80211/util.c

+1 −3
Original line number Diff line number Diff line
@@ -2450,7 +2450,6 @@ int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, 


	if (ieee80211_vif_is_mesh(&sdata->vif)) {

		struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

		__le16 pre_value;



		skb_put(skb, 8);

		*pos++ = WLAN_EID_CHAN_SWITCH_PARAM;		/* EID */
@@ -2466,8 +2465,7 @@ int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, 
			ifmsh->pre_value = 1;

		else

			ifmsh->pre_value++;

		pre_value = cpu_to_le16(ifmsh->pre_value);

		memcpy(pos, &pre_value, 2);		/* Precedence Value */

		put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */

		pos += 2;

		ifmsh->chsw_init = true;

	}