Merge tag 'mlx5-updates-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / mac80211 / mesh_ps.c

diff --git a/net/mac80211/mesh_ps.c b/net/mac80211/mesh_ps.c
index 90a268abea171aebc5d5907929db0804a2b0f7b0..d8cd91424175bfeed7749f85eb0141266a8895b1 100644 (file)
--- a/net/mac80211/mesh_ps.c
+++ b/net/mac80211/mesh_ps.c
@@ -30,7 +30,7 @@ static struct sk_buff *mps_qos_null_get(struct sta_info *sta)
                return NULL;
        skb_reserve(skb, local->hw.extra_tx_headroom);
 
-       nullfunc = (struct ieee80211_hdr *) skb_put(skb, size);
+       nullfunc = skb_put(skb, size);
        fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);
        ieee80211_fill_mesh_addresses(nullfunc, &fc, sta->sta.addr,
                                      sdata->vif.addr);
@@ -39,7 +39,7 @@ static struct sk_buff *mps_qos_null_get(struct sta_info *sta)
        nullfunc->seq_ctrl = 0;
        /* no address resolution for this frame -> set addr 1 immediately */
        memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN);
-       memset(skb_put(skb, 2), 0, 2); /* append QoS control field */
+       skb_put_zero(skb, 2); /* append QoS control field */
        ieee80211_mps_set_frame_flags(sdata, sta, nullfunc);
 
        return skb;