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

Commit 4305b541 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: Convert skb->end to sk_buff_data_t 



Now to convert the last one, skb->data, that will allow many simplifications
and removal of some of the offset helpers.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27a884dc

arch/ia64/sn/kernel/xpnet.c

+3 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) 


	dev_dbg(xpnet, "<skb->head=0x%p skb->data=0x%p skb->tail=0x%p "

		"skb->end=0x%p skb->len=%d\n", (void *) skb->head,

		(void *)skb->data, skb_tail_pointer(skb), (void *)skb->end,

		(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),

		skb->len);



	skb->protocol = eth_type_trans(skb, xpnet_device);
@@ -273,7 +273,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) 
	dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p "

		"skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n",

		(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),

		(void *) skb->end, skb->len);

		skb_end_pointer(skb), skb->len);





	xpnet_device->last_rx = jiffies;
@@ -475,7 +475,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p "

		"skb->end=0x%p skb->len=%d\n", (void *) skb->head,

		(void *)skb->data, skb_tail_pointer(skb), (void *)skb->end,

		(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),

		skb->len);

drivers/atm/ambassador.c

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static inline void fill_rx_pool (amb_dev * dev, unsigned char pool, 
    }

    // cast needed as there is no %? for pointer differences

    PRINTD (DBG_SKB, "allocated skb at %p, head %p, area %li",

	    skb, skb->head, (long) (skb->end - skb->head));

	    skb, skb->head, (long) (skb_end_pointer(skb) - skb->head));

    rx.handle = virt_to_bus (skb);

    rx.host_address = cpu_to_be32 (virt_to_bus (skb->data));

    if (rx_give (dev, &rx, pool))

drivers/atm/idt77252.c

+15 −9
Original line number Diff line number Diff line
@@ -1065,7 +1065,8 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) 
	vcc = vc->rx_vcc;



	pci_dma_sync_single_for_cpu(card->pcidev, IDT77252_PRV_PADDR(skb),

				    skb->end - skb->data, PCI_DMA_FROMDEVICE);

				    skb_end_pointer(skb) - skb->data,

				    PCI_DMA_FROMDEVICE);



	if ((vcc->qos.aal == ATM_AAL0) ||

	    (vcc->qos.aal == ATM_AAL34)) {
@@ -1194,7 +1195,8 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) 
		}



		pci_unmap_single(card->pcidev, IDT77252_PRV_PADDR(skb),

				 skb->end - skb->data, PCI_DMA_FROMDEVICE);

				 skb_end_pointer(skb) - skb->data,

				 PCI_DMA_FROMDEVICE);

		sb_pool_remove(card, skb);



		skb_trim(skb, len);
@@ -1267,7 +1269,7 @@ idt77252_rx_raw(struct idt77252_dev *card) 
	tail = readl(SAR_REG_RAWCT);



	pci_dma_sync_single_for_cpu(card->pcidev, IDT77252_PRV_PADDR(queue),

				    queue->end - queue->head - 16,

				    skb_end_pointer(queue) - queue->head - 16,

				    PCI_DMA_FROMDEVICE);



	while (head != tail) {
@@ -1363,7 +1365,8 @@ idt77252_rx_raw(struct idt77252_dev *card) 
				queue = card->raw_cell_head;

				pci_dma_sync_single_for_cpu(card->pcidev,

							    IDT77252_PRV_PADDR(queue),

							    queue->end - queue->data,

							    (skb_end_pointer(queue) -

							     queue->data),

							    PCI_DMA_FROMDEVICE);

			} else {

				card->raw_cell_head = NULL;
@@ -1875,7 +1878,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, 
		}



		paddr = pci_map_single(card->pcidev, skb->data,

				       skb->end - skb->data,

				       skb_end_pointer(skb) - skb->data,

				       PCI_DMA_FROMDEVICE);

		IDT77252_PRV_PADDR(skb) = paddr;
@@ -1889,7 +1892,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, 


outunmap:

	pci_unmap_single(card->pcidev, IDT77252_PRV_PADDR(skb),

			 skb->end - skb->data, PCI_DMA_FROMDEVICE);

			 skb_end_pointer(skb) - skb->data, PCI_DMA_FROMDEVICE);



	handle = IDT77252_PRV_POOL(skb);

	card->sbpool[POOL_QUEUE(handle)].skb[POOL_INDEX(handle)] = NULL;
@@ -1906,12 +1909,14 @@ recycle_rx_skb(struct idt77252_dev *card, struct sk_buff *skb) 
	int err;



	pci_dma_sync_single_for_device(card->pcidev, IDT77252_PRV_PADDR(skb),

				       skb->end - skb->data, PCI_DMA_FROMDEVICE);

				       skb_end_pointer(skb) - skb->data,

				       PCI_DMA_FROMDEVICE);



	err = push_rx_skb(card, skb, POOL_QUEUE(handle));

	if (err) {

		pci_unmap_single(card->pcidev, IDT77252_PRV_PADDR(skb),

				 skb->end - skb->data, PCI_DMA_FROMDEVICE);

				 skb_end_pointer(skb) - skb->data,

				 PCI_DMA_FROMDEVICE);

		sb_pool_remove(card, skb);

		dev_kfree_skb(skb);

	}
@@ -3123,7 +3128,8 @@ deinit_card(struct idt77252_dev *card) 
			if (skb) {

				pci_unmap_single(card->pcidev,

						 IDT77252_PRV_PADDR(skb),

						 skb->end - skb->data,

						 (skb_end_pointer(skb) -

						  skb->data),

						 PCI_DMA_FROMDEVICE);

				card->sbpool[i].skb[j] = NULL;

				dev_kfree_skb(skb);

drivers/infiniband/hw/cxgb3/iwch_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static void send_mpa_req(struct iwch_ep *ep, struct sk_buff *skb) 
	BUG_ON(skb_cloned(skb));



	mpalen = sizeof(*mpa) + ep->plen;

	if (skb->data + mpalen + sizeof(*req) > skb->end) {

	if (skb->data + mpalen + sizeof(*req) > skb_end_pointer(skb)) {

		kfree_skb(skb);

		skb=alloc_skb(mpalen + sizeof(*req), GFP_KERNEL);

		if (!skb) {

drivers/net/cris/eth_v10.c

+2 −1
Original line number Diff line number Diff line
@@ -1348,7 +1348,8 @@ e100_rx(struct net_device *dev) 


#ifdef ETHDEBUG

		printk("head = 0x%x, data = 0x%x, tail = 0x%x, end = 0x%x\n",

		  skb->head, skb->data, skb_tail_pointer(skb), skb->end);

		       skb->head, skb->data, skb_tail_pointer(skb),

		       skb_end_pointer(skb));

		printk("copying packet to 0x%x.\n", skb_data_ptr);

#endif