skbuff/mac80211: introduce and use skb_put_zero()

This pattern was introduced a number of times in mac80211 just now,
and since it's present in a number of other places it makes sense
to add a little helper for it.

This just adds the helper and transforms the mac80211 code, a later
patch will transform other places.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index bfc7892f6c33c9fdfb7c0d8110f80cfb12d1ae61..d92056b2da44de91e4a13e4f00b1ea06906e6fee 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1937,6 +1937,15 @@ static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
        return tmp;
 }
 
+static inline unsigned char *skb_put_zero(struct sk_buff *skb, unsigned int len)
+{
+       unsigned char *tmp = skb_put(skb, len);
+
+       memset(tmp, 0, len);
+
+       return tmp;
+}
+
 unsigned char *skb_push(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
 {

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 3d6b3d674ca33edb62274245752db65b3b9d648e..ad5d1cf391904d67cdad7da44044bc25cfc66a97 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -744,8 +744,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
                int ie_len = 2 + sizeof(struct ieee80211_channel_sw_ie) +
                             2 + sizeof(struct ieee80211_mesh_chansw_params_ie);
 
-               pos = skb_put(skb, ie_len);
-               memset(pos, 0, ie_len);
+               pos = skb_put_zero(skb, ie_len);
                *pos++ = WLAN_EID_CHANNEL_SWITCH;
                *pos++ = 3;
                *pos++ = 0x0;
@@ -772,8 +771,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
                switch (csa->settings.chandef.width) {
                case NL80211_CHAN_WIDTH_40:
                        ie_len = 2 + sizeof(struct ieee80211_sec_chan_offs_ie);
-                       pos = skb_put(skb, ie_len);
-                       memset(pos, 0, ie_len);
+                       pos = skb_put_zero(skb, ie_len);
 
                        *pos++ = WLAN_EID_SECONDARY_CHANNEL_OFFSET; /* EID */
                        *pos++ = 1;                                 /* len */
@@ -789,8 +787,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
                        /* Channel Switch Wrapper + Wide Bandwidth CSA IE */
                        ie_len = 2 + 2 +
                                 sizeof(struct ieee80211_wide_bw_chansw_ie);
-                       pos = skb_put(skb, ie_len);
-                       memset(pos, 0, ie_len);
+                       pos = skb_put_zero(skb, ie_len);
 
                        *pos++ = WLAN_EID_CHANNEL_SWITCH_WRAPPER; /* EID */
                        *pos++ = 5;                               /* len */

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 1131cd504a15ef5fa507c37c8a5464aac173321f..82cfd232a25eb39081ae594699e8924dd160399e 100644 (file)
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -264,8 +264,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
                band = sband->band;
 
                /* capability info */
-               pos = skb_put(skb, 2);
-               memset(pos, 0, 2);
+               pos = skb_put_zero(skb, 2);
                if (action == WLAN_SP_MESH_PEERING_CONFIRM) {
                        /* AID */
                        pos = skb_put(skb, 2);