summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.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/mlme.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/mlme.c')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 1929bce8e518..e810334595ff 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -674,8 +674,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
674 if (ifmgd->flags & IEEE80211_STA_ENABLE_RRM) 674 if (ifmgd->flags & IEEE80211_STA_ENABLE_RRM)
675 capab |= WLAN_CAPABILITY_RADIO_MEASURE; 675 capab |= WLAN_CAPABILITY_RADIO_MEASURE;
676 676
677 mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); 677 mgmt = skb_put_zero(skb, 24);
678 memset(mgmt, 0, 24);
679 memcpy(mgmt->da, assoc_data->bss->bssid, ETH_ALEN); 678 memcpy(mgmt->da, assoc_data->bss->bssid, ETH_ALEN);
680 memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN); 679 memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
681 memcpy(mgmt->bssid, assoc_data->bss->bssid, ETH_ALEN); 680 memcpy(mgmt->bssid, assoc_data->bss->bssid, ETH_ALEN);
@@ -949,8 +948,7 @@ static void ieee80211_send_4addr_nullfunc(struct ieee80211_local *local,
949 948
950 skb_reserve(skb, local->hw.extra_tx_headroom); 949 skb_reserve(skb, local->hw.extra_tx_headroom);
951 950
952 nullfunc = (struct ieee80211_hdr *) skb_put(skb, 30); 951 nullfunc = skb_put_zero(skb, 30);
953 memset(nullfunc, 0, 30);
954 fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC | 952 fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC |
955 IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS); 953 IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS);
956 nullfunc->frame_control = fc; 954 nullfunc->frame_control = fc;