aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/realtek/rtlwifi/base.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-06-16 08:29:19 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-16 11:48:35 -0400
commitb080db585384b9f037e015c0c28d1ad33be41dfc (patch)
treeea9cc5c3161d776b948283a3d4f483cbf578e043 /drivers/net/wireless/realtek/rtlwifi/base.c
parent61f73d1ea4c68544b959228ead7ef5c021791b14 (diff)
networking: convert many more places to skb_put_zero()
There were many places that my previous spatch didn't find, as pointed out by yuan linyu in various patches. The following spatch found many more and also removes the now unnecessary casts: @@ identifier p, p2; expression len; expression skb; type t, t2; @@ ( -p = skb_put(skb, len); +p = skb_put_zero(skb, len); | -p = (t)skb_put(skb, len); +p = skb_put_zero(skb, len); ) ... when != p ( p2 = (t2)p; -memset(p2, 0, len); | -memset(p, 0, len); ) @@ type t, t2; identifier p, p2; expression skb; @@ t *p; ... ( -p = skb_put(skb, sizeof(t)); +p = skb_put_zero(skb, sizeof(t)); | -p = (t *)skb_put(skb, sizeof(t)); +p = skb_put_zero(skb, sizeof(t)); ) ... when != p ( p2 = (t2)p; -memset(p2, 0, sizeof(*p)); | -memset(p, 0, sizeof(*p)); ) @@ expression skb, len; @@ -memset(skb_put(skb, len), 0, len); +skb_put_zero(skb, len); Apply it to the tree (with one manual fixup to keep the comment in vxlan.c, which spatch removed.) Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/base.c')
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/base.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index bdc379178e87..710e5b447cff 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -1875,8 +1875,7 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
1875 return NULL; 1875 return NULL;
1876 1876
1877 skb_reserve(skb, hw->extra_tx_headroom); 1877 skb_reserve(skb, hw->extra_tx_headroom);
1878 action_frame = (void *)skb_put(skb, 27); 1878 action_frame = skb_put_zero(skb, 27);
1879 memset(action_frame, 0, 27);
1880 memcpy(action_frame->da, da, ETH_ALEN); 1879 memcpy(action_frame->da, da, ETH_ALEN);
1881 memcpy(action_frame->sa, rtlefuse->dev_addr, ETH_ALEN); 1880 memcpy(action_frame->sa, rtlefuse->dev_addr, ETH_ALEN);
1882 memcpy(action_frame->bssid, bssid, ETH_ALEN); 1881 memcpy(action_frame->bssid, bssid, ETH_ALEN);
@@ -2005,8 +2004,7 @@ struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
2005 return NULL; 2004 return NULL;
2006 2005
2007 skb_reserve(skb, hw->extra_tx_headroom); 2006 skb_reserve(skb, hw->extra_tx_headroom);
2008 action_frame = (void *)skb_put(skb, 34); 2007 action_frame = skb_put_zero(skb, 34);
2009 memset(action_frame, 0, 34);
2010 memcpy(action_frame->sa, sa, ETH_ALEN); 2008 memcpy(action_frame->sa, sa, ETH_ALEN);
2011 memcpy(action_frame->da, rtlefuse->dev_addr, ETH_ALEN); 2009 memcpy(action_frame->da, rtlefuse->dev_addr, ETH_ALEN);
2012 memcpy(action_frame->bssid, bssid, ETH_ALEN); 2010 memcpy(action_frame->bssid, bssid, ETH_ALEN);