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>
This commit is contained in:

committed by
David S. Miller

parent
61f73d1ea4
commit
b080db5853
@@ -135,7 +135,7 @@ static struct sk_buff *qtnf_cmd_alloc_new_cmdskb(u8 macid, u8 vifid, u16 cmd_no,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memset(skb_put(cmd_skb, cmd_size), 0, cmd_size);
|
||||
skb_put_zero(cmd_skb, cmd_size);
|
||||
|
||||
cmd = (struct qlink_cmd *)cmd_skb->data;
|
||||
cmd->mhdr.len = cpu_to_le16(cmd_skb->len);
|
||||
@@ -238,9 +238,7 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif)
|
||||
bss_cfg->bcn_period);
|
||||
qtnf_cmd_skb_put_tlv_u8(cmd_skb, QTN_TLV_ID_DTIM, bss_cfg->dtim);
|
||||
|
||||
qchan = (struct qlink_tlv_channel *)skb_put(cmd_skb, sizeof(*qchan));
|
||||
|
||||
memset(qchan, 0, sizeof(*qchan));
|
||||
qchan = skb_put_zero(cmd_skb, sizeof(*qchan));
|
||||
qchan->hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL);
|
||||
qchan->hdr.len = cpu_to_le16(sizeof(*qchan) -
|
||||
sizeof(struct qlink_tlv_hdr));
|
||||
@@ -1794,9 +1792,7 @@ int qtnf_cmd_send_scan(struct qtnf_wmac *mac)
|
||||
pr_debug("MAC%u: scan chan=%d, freq=%d, flags=%#x\n",
|
||||
mac->macid, sc->hw_value, sc->center_freq,
|
||||
sc->flags);
|
||||
qchan = (struct qlink_tlv_channel *)
|
||||
skb_put(cmd_skb, sizeof(*qchan));
|
||||
memset(qchan, 0, sizeof(*qchan));
|
||||
qchan = skb_put_zero(cmd_skb, sizeof(*qchan));
|
||||
flags = 0;
|
||||
|
||||
qchan->hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL);
|
||||
|
Reference in New Issue
Block a user