Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa9f979c authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

networking: use skb_put_zero() 



Use the recently introduced helper to replace the pattern of
skb_put() && memset(), this transformation was done with the
following spatch:

@@
identifier p;
expression len;
expression skb;
@@
-p = skb_put(skb, len);
-memset(p, 0, len);
+p = skb_put_zero(skb, len);

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e74008b

drivers/net/ethernet/apple/bmac.c

+1 −2
Original line number Diff line number Diff line
@@ -1218,8 +1218,7 @@ static void bmac_reset_and_enable(struct net_device *dev) 
	 */

	skb = netdev_alloc_skb(dev, ETHERMINPACKET);

	if (skb != NULL) {

		data = skb_put(skb, ETHERMINPACKET);

		memset(data, 0, ETHERMINPACKET);

		data = skb_put_zero(skb, ETHERMINPACKET);

		memcpy(data, dev->dev_addr, ETH_ALEN);

		memcpy(data + ETH_ALEN, dev->dev_addr, ETH_ALEN);

		bmac_transmit_packet(skb, dev);

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+1 −2
Original line number Diff line number Diff line
@@ -609,8 +609,7 @@ static int bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			dev_kfree_skb(skb);

			skb = nskb;

		}

		data = skb_put(skb, needed);

		memset(data, 0, needed);

		data = skb_put_zero(skb, needed);

	}



	/* point to the next available desc */

drivers/net/ethernet/qualcomm/qca_spi.c

+1 −2
Original line number Diff line number Diff line
@@ -719,8 +719,7 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	qcafrm_create_header(ptmp, frame_len);



	if (pad_len) {

		ptmp = skb_put(skb, pad_len);

		memset(ptmp, 0, pad_len);

		ptmp = skb_put_zero(skb, pad_len);

	}



	ptmp = skb_put(skb, QCAFRM_FOOTER_LEN);

drivers/net/wireless/marvell/mwifiex/tdls.c

+2 −2
Original line number Diff line number Diff line
@@ -853,8 +853,8 @@ int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, const u8 *peer, 


	pkt_type = PKT_TYPE_MGMT;

	tx_control = 0;

	pos = skb_put(skb, MWIFIEX_MGMT_FRAME_HEADER_SIZE + sizeof(pkt_len));

	memset(pos, 0, MWIFIEX_MGMT_FRAME_HEADER_SIZE + sizeof(pkt_len));

	pos = skb_put_zero(skb,

			   MWIFIEX_MGMT_FRAME_HEADER_SIZE + sizeof(pkt_len));

	memcpy(pos, &pkt_type, sizeof(pkt_type));

	memcpy(pos + sizeof(pkt_type), &tx_control, sizeof(tx_control));

drivers/nfc/pn533/pn533.c

+1 −2
Original line number Diff line number Diff line
@@ -1043,8 +1043,7 @@ static struct sk_buff *pn533_alloc_poll_tg_frame(struct pn533 *dev) 
	get_random_bytes(felica + 2, 6);



	/* NFCID3 */

	nfcid3 = skb_put(skb, 10);

	memset(nfcid3, 0, 10);

	nfcid3 = skb_put_zero(skb, 10);

	memcpy(nfcid3, felica, 8);



	/* General bytes */