Merge tag 'wireless-drivers-next-for-davem-2017-06-25' of git://git.kernel.org/pub...

[karo-tx-linux.git] / drivers / net / wireless / realtek / rtlwifi / base.c

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 180850cb46719f73260ab4c03eeb74df12011e81..d34ad94c327bd2d5206510d6a45b058d2d897b5a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -2023,8 +2023,7 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
                return NULL;
 
        skb_reserve(skb, hw->extra_tx_headroom);
-       action_frame = (void *)skb_put(skb, 27);
-       memset(action_frame, 0, 27);
+       action_frame = skb_put_zero(skb, 27);
        memcpy(action_frame->da, da, ETH_ALEN);
        memcpy(action_frame->sa, rtlefuse->dev_addr, ETH_ALEN);
        memcpy(action_frame->bssid, bssid, ETH_ALEN);
@@ -2153,8 +2152,7 @@ struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
                return NULL;
 
        skb_reserve(skb, hw->extra_tx_headroom);
-       action_frame = (void *)skb_put(skb, 34);
-       memset(action_frame, 0, 34);
+       action_frame = skb_put_zero(skb, 34);
        memcpy(action_frame->sa, sa, ETH_ALEN);
        memcpy(action_frame->da, rtlefuse->dev_addr, ETH_ALEN);
        memcpy(action_frame->bssid, bssid, ETH_ALEN);