From 9feaefe50dafd01b46ff054b9e9b3d0ed555e959 Mon Sep 17 00:00:00 2001
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Mon, 14 Apr 2008 00:05:09 -0700
Subject: [PATCH] --- yaml --- r: 90673 b: refs/heads/master c:
 7de6c033367ab86f39c7723392caf73325cbf286 h: refs/heads/master i:   90671:
 e0ce5317655d1aafc04027d137e93a5f3a1a9232 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/skbuff.h | 12 +++---------
 trunk/include/net/tcp.h      |  2 +-
 trunk/net/core/skbuff.c      |  2 +-
 trunk/net/ipv4/tcp_input.c   |  2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4afb2855aa4b..630402aa1d7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf299275882624b1908521ee8074df85160e9679
+refs/heads/master: 7de6c033367ab86f39c7723392caf73325cbf286
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index bb107ab675fc..83c851846829 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -697,6 +697,9 @@ static inline void __skb_queue_after(struct sk_buff_head *list,
 	__skb_insert(newsk, prev, prev->next, list);
 }
 
+extern void skb_append(struct sk_buff *old, struct sk_buff *newsk,
+		       struct sk_buff_head *list);
+
 /**
  *	__skb_queue_head - queue a buffer at the list head
  *	@list: list to use
@@ -738,15 +741,6 @@ static inline void __skb_queue_tail(struct sk_buff_head *list,
 	next->prev  = prev->next = newsk;
 }
 
-/*
- *	Place a packet after a given packet in a list.
- */
-extern void	   skb_append(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list);
-static inline void __skb_append(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list)
-{
-	__skb_insert(newsk, old, old->next, list);
-}
-
 /*
  * remove sk_buff from list. _Must_ be called atomically, and with
  * the list known..
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 58d82822414d..2ab350eca02e 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/include/net/tcp.h
@@ -1247,7 +1247,7 @@ static inline void tcp_insert_write_queue_after(struct sk_buff *skb,
 						struct sk_buff *buff,
 						struct sock *sk)
 {
-	__skb_append(skb, buff, &sk->sk_write_queue);
+	__skb_queue_after(&sk->sk_write_queue, skb, buff);
 }
 
 /* Insert skb between prev and next on the write queue of sk.  */
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index e4259215607f..4cd12d99b12e 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -1860,7 +1860,7 @@ void skb_append(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head
 	unsigned long flags;
 
 	spin_lock_irqsave(&list->lock, flags);
-	__skb_append(old, newsk, list);
+	__skb_queue_after(list, old, newsk);
 	spin_unlock_irqrestore(&list->lock, flags);
 }
 
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 6e46b4c0f28c..743611956045 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -3968,7 +3968,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
 		u32 end_seq = TCP_SKB_CB(skb)->end_seq;
 
 		if (seq == TCP_SKB_CB(skb1)->end_seq) {
-			__skb_append(skb1, skb, &tp->out_of_order_queue);
+			__skb_queue_after(&tp->out_of_order_queue, skb1, skb);
 
 			if (!tp->rx_opt.num_sacks ||
 			    tp->selective_acks[0].end_seq != seq)