4 files changed, 6 insertions, 12 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index bb107ab675fc..83c851846829 100644
--- a/include/linux/skbuff.h
+++ b/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
@@ -739,15 +742,6 @@ static inline void __skb_queue_tail(struct sk_buff_head *list,
 }
 
 /*
- *      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/include/net/tcp.h b/include/net/tcp.h
index 58d82822414d..2ab350eca02e 100644
--- a/include/net/tcp.h
+++ b/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/net/core/skbuff.c b/net/core/skbuff.c
index e4259215607f..4cd12d99b12e 100644
--- a/net/core/skbuff.c
+++ b/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/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 6e46b4c0f28c..743611956045 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3968,7 +3968,7 @@ drop:
                 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)