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

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

networking: introduce and use skb_put_data() 



A common pattern with skb_put() is to just want to memcpy()
some data into the new space, introduce skb_put_data() for
this.

An spatch similar to the one for skb_put_zero() converts many
of the places using it:

    @@
    identifier p, p2;
    expression len, skb, data;
    type t, t2;
    @@
    (
    -p = skb_put(skb, len);
    +p = skb_put_data(skb, data, len);
    |
    -p = (t)skb_put(skb, len);
    +p = skb_put_data(skb, data, len);
    )
    (
    p2 = (t2)p;
    -memcpy(p2, data, len);
    |
    -memcpy(p, data, len);
    )

    @@
    type t, t2;
    identifier p, p2;
    expression skb, data;
    @@
    t *p;
    ...
    (
    -p = skb_put(skb, sizeof(t));
    +p = skb_put_data(skb, data, sizeof(t));
    |
    -p = (t *)skb_put(skb, sizeof(t));
    +p = skb_put_data(skb, data, sizeof(t));
    )
    (
    p2 = (t2)p;
    -memcpy(p2, data, sizeof(*p));
    |
    -memcpy(p, data, sizeof(*p));
    )

    @@
    expression skb, len, data;
    @@
    -memcpy(skb_put(skb, len), data, len);
    +skb_put_data(skb, data, len);

(again, manually post-processed to retain some comments)

Reviewed-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b080db58

drivers/atm/fore200e.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp 
	/* Make device DMA transfer visible to CPU.  */

	fore200e->bus->dma_sync_for_cpu(fore200e, buffer->data.dma_addr, rpd->rsd[ i ].length, DMA_FROM_DEVICE);

	

	memcpy(skb_put(skb, rpd->rsd[ i ].length), buffer->data.align_addr, rpd->rsd[ i ].length);

	skb_put_data(skb, buffer->data.align_addr, rpd->rsd[i].length);



	/* Now let the device get at it again.  */

	fore200e->bus->dma_sync_for_device(fore200e, buffer->data.dma_addr, rpd->rsd[ i ].length, DMA_FROM_DEVICE);

drivers/atm/he.c

+1 −1
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) 
		__net_timestamp(skb);



		list_for_each_entry(heb, &he_vcc->buffers, entry)

			memcpy(skb_put(skb, heb->len), &heb->data, heb->len);

			skb_put_data(skb, &heb->data, heb->len);



		switch (vcc->qos.aal) {

			case ATM_AAL0:

drivers/atm/idt77252.c

+4 −7
Original line number Diff line number Diff line
@@ -1090,8 +1090,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) 


			*((u32 *) sb->data) = aal0;

			skb_put(sb, sizeof(u32));

			memcpy(skb_put(sb, ATM_CELL_PAYLOAD),

			       cell, ATM_CELL_PAYLOAD);

			skb_put_data(sb, cell, ATM_CELL_PAYLOAD);



			ATM_SKB(sb)->vcc = vcc;

			__net_timestamp(sb);
@@ -1159,8 +1158,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) 
				return;

			}

			skb_queue_walk(&rpp->queue, sb)

				memcpy(skb_put(skb, sb->len),

				       sb->data, sb->len);

				skb_put_data(skb, sb->data, sb->len);



			recycle_rx_pool_skb(card, rpp);
@@ -1322,8 +1320,7 @@ idt77252_rx_raw(struct idt77252_dev *card) 


		*((u32 *) sb->data) = header;

		skb_put(sb, sizeof(u32));

		memcpy(skb_put(sb, ATM_CELL_PAYLOAD), &(queue->data[16]),

		       ATM_CELL_PAYLOAD);

		skb_put_data(sb, &(queue->data[16]), ATM_CELL_PAYLOAD);



		ATM_SKB(sb)->vcc = vcc;

		__net_timestamp(sb);
@@ -2014,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags) 
	}

	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);



	memcpy(skb_put(skb, 52), cell, 52);

	skb_put_data(skb, cell, 52);



	return idt77252_send_skb(vcc, skb, 1);

}

drivers/atm/solos-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int send_command(struct solos_card *card, int dev, const char *buf, size_ 
	header->vci = cpu_to_le16(0);

	header->type = cpu_to_le16(PKT_COMMAND);



	memcpy(skb_put(skb, size), buf, size);

	skb_put_data(skb, buf, size);



	fpga_queue(card, dev, skb, NULL);

drivers/bluetooth/bfusb.c

+3 −3
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch 
	}



	if (len > 0)

		memcpy(skb_put(data->reassembly, len), buf, len);

		skb_put_data(data->reassembly, buf, len);



	if (hdr & 0x08) {

		hci_recv_frame(data->hdev, data->reassembly);
@@ -505,7 +505,7 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
		buf[1] = 0x00;

		buf[2] = (size == BFUSB_MAX_BLOCK_SIZE) ? 0 : size;



		memcpy(skb_put(nskb, 3), buf, 3);

		skb_put_data(nskb, buf, 3);

		skb_copy_from_linear_data_offset(skb, sent, skb_put(nskb, size), size);



		sent  += size;
@@ -516,7 +516,7 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
	if ((nskb->len % data->bulk_pkt_size) == 0) {

		buf[0] = 0xdd;

		buf[1] = 0x00;

		memcpy(skb_put(nskb, 2), buf, 2);

		skb_put_data(nskb, buf, 2);

	}



	read_lock(&data->lock);