[Xen-changelog] [xen-unstable] Move skb_pull_rcsum() to its usual place in skbuff.c

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1170955189 0
# Node ID 273ec6b70b51f3f15416b939357c01f245080183
# Parent  859d73ef932f8575e013baa6bce2526d9f564a5d
Move skb_pull_rcsum() to its usual place in skbuff.c
---
 linux-2.6-xen-sparse/net/core/skbuff.c |   46 ++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff -r 859d73ef932f -r 273ec6b70b51 linux-2.6-xen-sparse/net/core/skbuff.c
--- a/linux-2.6-xen-sparse/net/core/skbuff.c    Thu Feb 08 17:15:38 2007 +0000
+++ b/linux-2.6-xen-sparse/net/core/skbuff.c    Thu Feb 08 17:19:49 2007 +0000
@@ -1897,6 +1897,29 @@ int skb_append_datato_frags(struct sock 
 }
 
 /**
+ *     skb_pull_rcsum - pull skb and update receive checksum
+ *     @skb: buffer to update
+ *     @start: start of data before pull
+ *     @len: length of data pulled
+ *
+ *     This function performs an skb_pull on the packet and updates
+ *     update the CHECKSUM_HW checksum.  It should be used on receive
+ *     path processing instead of skb_pull unless you know that the
+ *     checksum difference is zero (e.g., a valid IP header) or you
+ *     are setting ip_summed to CHECKSUM_NONE.
+ */
+unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len)
+{
+       BUG_ON(len > skb->len);
+       skb->len -= len;
+       BUG_ON(skb->len < skb->data_len);
+       skb_postpull_rcsum(skb, skb->data, len);
+       return skb->data += len;
+}
+
+EXPORT_SYMBOL_GPL(skb_pull_rcsum);
+
+/**
  *     skb_segment - Perform protocol segmentation on skb.
  *     @skb: buffer to segment
  *     @features: features for the output path (see dev->features)
@@ -2021,29 +2044,6 @@ err:
 }
 
 EXPORT_SYMBOL_GPL(skb_segment);
-
-/**
- *     skb_pull_rcsum - pull skb and update receive checksum
- *     @skb: buffer to update
- *     @start: start of data before pull
- *     @len: length of data pulled
- *
- *     This function performs an skb_pull on the packet and updates
- *     update the CHECKSUM_HW checksum.  It should be used on receive
- *     path processing instead of skb_pull unless you know that the
- *     checksum difference is zero (e.g., a valid IP header) or you
- *     are setting ip_summed to CHECKSUM_NONE.
- */
-unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len)
-{
-       BUG_ON(len > skb->len);
-       skb->len -= len;
-       BUG_ON(skb->len < skb->data_len);
-       skb_postpull_rcsum(skb, skb->data, len);
-       return skb->data += len;
-}
-
-EXPORT_SYMBOL_GPL(skb_pull_rcsum);
 
 void __init skb_init(void)
 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog