[SK_BUFF]: Convert skb->tail to sk_buff_data_t

[karo-tx-linux.git] / arch / ia64 / sn / kernel / xpnet.c

diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index 007703c494a439b47bd82ba3898891585f38530c..eb416c95967d91ada6cf0fad312b0c23ce0109d8 100644 (file)
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -225,7 +225,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
        skb_put(skb, (msg->size - msg->leadin_ignore - msg->tailout_ignore));
 
        /*
-        * Move the data over from the the other side.
+        * Move the data over from the other side.
         */
        if ((XPNET_VERSION_MINOR(msg->version) == 1) &&
                                                (msg->embedded_bytes != 0)) {
@@ -264,16 +264,15 @@ 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, (void *) skb->tail, (void *) skb->end,
+               (void *)skb->data, skb_tail_pointer(skb), (void *)skb->end,
                skb->len);
 
-       skb->dev = xpnet_device;
        skb->protocol = eth_type_trans(skb, xpnet_device);
        skb->ip_summed = CHECKSUM_UNNECESSARY;
 
        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, (void *) skb->tail,
+               (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
                (void *) skb->end, skb->len);
 
 
@@ -476,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, (void *) skb->tail, (void *) skb->end,
+               (void *)skb->data, skb_tail_pointer(skb), (void *)skb->end,
                skb->len);
 
 
@@ -498,7 +497,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        /* get the beginning of the first cacheline and end of last */
        start_addr = ((u64) skb->data & ~(L1_CACHE_BYTES - 1));
-       end_addr = L1_CACHE_ALIGN((u64) skb->tail);
+       end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));
 
        /* calculate how many bytes to embed in the XPC message */
        embedded_bytes = 0;
@@ -574,7 +573,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                msg->magic = XPNET_MAGIC;
                msg->size = end_addr - start_addr;
                msg->leadin_ignore = (u64) skb->data - start_addr;
-               msg->tailout_ignore = end_addr - (u64) skb->tail;
+               msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
                msg->buf_pa = __pa(start_addr);
 
                dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa="