Re: [PATCH] mac80211: use put_unaligned_le16 for precedence value in mesh

Re: [PATCH] mac80211: use put_unaligned_le16 for precedence value in mesh

[Johannes Berg]

On Tue, 2013-11-12 at 10:31 +0800, Chun-Yeow Yeoh wrote:
> use put_unaligned_le16 for precedence value in mesh
> channel switch support

Applied - there are more potential places I guess.

johannes


> 
> Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
> ---
>  net/mac80211/mesh.c |    5 +----
>  net/mac80211/util.c |    4 +---
>  2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
> index ba10525..01a6685 100644
> --- a/net/mac80211/mesh.c
> +++ b/net/mac80211/mesh.c
> @@ -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();
> diff --git a/net/mac80211/util.c b/net/mac80211/util.c
> index 7650efa..679e9d7 100644
> --- a/net/mac80211/util.c
> +++ b/net/mac80211/util.c
> @@ -2449,7 +2449,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
> */
> @@ -2461,8 +2460,7 @@ int ieee80211_send_action_csa(struct
> ieee80211_sub_if_data *sdata,
>                           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 */
> +               put_unaligned_le16(ifmsh->pre_value, pos);/*
> Precedence Value */
>                 pos += 2;
>         }
>  
> -- 
> 1.7.9.5