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

Commit 3dc02251 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'skb-accessor-cleanups' 



Johannes Berg says:

====================
skb data accessors cleanup

Over night, Fengguang's bot told me that it compiled all of its many
various configurations successfully, and I had done allyesconfig on
x86_64 myself yesterday to iron out the things I missed.

So now I think I'm happy with it.

My tree was based on your

    commit 3715c47b
    Merge: 18b6e795 d8fbd274
    Author: David S. Miller <davem@davemloft.net>
    Date:   Thu Jun 15 14:31:56 2017 -0400

        Merge branch 'r8152-support-new-chips'

when the compilation tests happened, but I've reviewed the changes
coming into net-next in the meantime and didn't see any new usages
of skb data accessors having come in.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61f73d1e 634fef61

drivers/atm/atmtcp.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type, 
		return -EUNATCH;

	}

	atm_force_charge(out_vcc,skb->truesize);

	new_msg = (struct atmtcp_control *) skb_put(skb,sizeof(*new_msg));

	new_msg = skb_put(skb, sizeof(*new_msg));

	*new_msg = *msg;

	new_msg->hdr.length = ATMTCP_HDR_MAGIC;

	new_msg->type = type;
@@ -217,7 +217,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb) 
		atomic_inc(&vcc->stats->tx_err);

		return -ENOBUFS;

	}

	hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));

	hdr = skb_put(new_skb, sizeof(struct atmtcp_hdr));

	hdr->vpi = htons(vcc->vpi);

	hdr->vci = htons(vcc->vci);

	hdr->length = htonl(skb->len);

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

+8 −8
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static ssize_t solos_param_show(struct device *dev, struct device_attribute *att 
		return -ENOMEM;

	}



	header = (void *)skb_put(skb, sizeof(*header));

	header = skb_put(skb, sizeof(*header));



	buflen = snprintf((void *)&header[1], buflen - 1,

			  "L%05d\n%s\n", current->pid, attr->attr.name);
@@ -261,7 +261,7 @@ static ssize_t solos_param_store(struct device *dev, struct device_attribute *at 
		return -ENOMEM;

	}



	header = (void *)skb_put(skb, sizeof(*header));

	header = skb_put(skb, sizeof(*header));



	buflen = snprintf((void *)&header[1], buflen - 1,

			  "L%05d\n%s\n%s\n", current->pid, attr->attr.name, buf);
@@ -486,14 +486,14 @@ static int send_command(struct solos_card *card, int dev, const char *buf, size_ 
		return 0;

	}



	header = (void *)skb_put(skb, sizeof(*header));

	header = skb_put(skb, sizeof(*header));



	header->size = cpu_to_le16(size);

	header->vpi = cpu_to_le16(0);

	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);
@@ -945,7 +945,7 @@ static int popen(struct atm_vcc *vcc) 
			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");

		return -ENOMEM;

	}

	header = (void *)skb_put(skb, sizeof(*header));

	header = skb_put(skb, sizeof(*header));



	header->size = cpu_to_le16(0);

	header->vpi = cpu_to_le16(vcc->vpi);
@@ -982,7 +982,7 @@ static void pclose(struct atm_vcc *vcc) 
		dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n");

		return;

	}

	header = (void *)skb_put(skb, sizeof(*header));

	header = skb_put(skb, sizeof(*header));



	header->size = cpu_to_le16(0);

	header->vpi = cpu_to_le16(vcc->vpi);
@@ -1174,7 +1174,7 @@ static int psend(struct atm_vcc *vcc, struct sk_buff *skb) 
		}

	}



	header = (void *)skb_push(skb, sizeof(*header));

	header = skb_push(skb, sizeof(*header));



	/* This does _not_ include the size of the header */

	header->size = cpu_to_le16(pktlen);
@@ -1398,7 +1398,7 @@ static int atm_init(struct solos_card *card, struct device *parent) 
			continue;

		}



		header = (void *)skb_put(skb, sizeof(*header));

		header = skb_put(skb, sizeof(*header));



		header->size = cpu_to_le16(0);

		header->vpi = cpu_to_le16(0);