aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.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 /net/mac80211/util.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 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index de0f1cdb64d4..148c7276869c 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1242,8 +1242,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
1242 1242
1243 skb_reserve(skb, local->hw.extra_tx_headroom + IEEE80211_WEP_IV_LEN); 1243 skb_reserve(skb, local->hw.extra_tx_headroom + IEEE80211_WEP_IV_LEN);
1244 1244
1245 mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24 + 6); 1245 mgmt = skb_put_zero(skb, 24 + 6);
1246 memset(mgmt, 0, 24 + 6);
1247 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | 1246 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
1248 IEEE80211_STYPE_AUTH); 1247 IEEE80211_STYPE_AUTH);
1249 memcpy(mgmt->da, da, ETH_ALEN); 1248 memcpy(mgmt->da, da, ETH_ALEN);
@@ -2999,8 +2998,7 @@ int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata,
2999 return -ENOMEM; 2998 return -ENOMEM;
3000 2999
3001 skb_reserve(skb, local->tx_headroom); 3000 skb_reserve(skb, local->tx_headroom);
3002 mgmt = (struct ieee80211_mgmt *)skb_put(skb, hdr_len); 3001 mgmt = skb_put_zero(skb, hdr_len);
3003 memset(mgmt, 0, hdr_len);
3004 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | 3002 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
3005 IEEE80211_STYPE_ACTION); 3003 IEEE80211_STYPE_ACTION);
3006 3004