: net: Remove __skb_insert() calls outside of skbuff internals.
Subsystems (4)
David Miller
maintainerPATCH 1/7 : net: Remove __skb_insert() calls outside of skbuff internals.
net: Remove __skb_insert() calls outside of skbuff internals.
This minor cleanup simplifies later changes which will convert struct sk_buff and friends over to using struct list_head.
Signed-off-by David S. Miller <[email protected]>
--- drivers/net/cassini.c | 2 +- drivers/net/ppp_generic.c | 2 +- drivers/net/pppol2tp.c | 2 +- include/net/tcp.h | 4 ++-- net/ipv4/tcp_input.c | 4 ++-- net/sctp/ulpqueue.c | 5 ++--- 6 files changed, 9 insertions(+), 10 deletions(-)
drivers/net/cassini.c +1 -1
@@ -2182,7 +2182,7 @@ static inline void cas_rx_flow_pkt(struct cas *cp, const u64 *words,* do any additional locking here. stick the buffer * at the end. */ -__skb_insert (skb, flow->prev, (struct sk_buff *) flow, flow); +__skb_queue_tail (flow, skb);if (words[0 ] &RX_COMP1_RELEASE_FLOW ) {while ((skb =__skb_dequeue (flow))) {cas_skb_release (skb);
drivers/net/ppp_generic.c +1 -1
@@ -1864,7 +1864,7 @@ ppp_mp_insert(struct ppp *ppp, struct sk_buff *skb)for (p = list->next; p != (struct sk_buff *)list; p = p->next)if (seq_before (seq, p->sequence))break ; -__skb_insert (skb, p->prev, p, list); +__skb_queue_before (list, p, skb); }/*
drivers/net/pppol2tp.c +1 -1
@@ -353,7 +353,7 @@ static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_spin_lock_bh (&session->reorder_q.lock); skb_queue_walk_safe(&session->reorder_q, skbp, tmp) {if (PPPOL2TP_SKB_CB (skbp)->ns > ns) { -__skb_insert (skb, skbp->prev, skbp, &session->reorder_q); +__skb_queue_before (&session->reorder_q, skbp, skb); PRINTK(session->debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG, "%s: pkt %hu, inserted before %hu, reorder_q len=%d\n", session->name, ns, PPPOL2TP_SKB_CB(skbp)->ns,
include/net/tcp.h +2 -2
@@ -1268,12 +1268,12 @@ static inline void tcp_insert_write_queue_after(struct sk_buff *skb,__skb_queue_after (&sk->sk_write_queue, skb, buff); } -/* Insert skb between prev and next on the write queue of sk. */ +/* Insert new before skb on the write queue of sk. */ static inline void tcp_insert_write_queue_before (struct sk_buff *new,struct sk_buff *skb,struct sock *sk) { -__skb_insert (new, skb->prev, skb, &sk->sk_write_queue); +__skb_queue_before (&sk->sk_write_queue, skb, new);if (sk->sk_send_head == skb) sk->sk_send_head = new;
net/ipv4/tcp_input.c +2 -2
@@ -4156,7 +4156,7 @@ drop: skb1 = skb1->prev; } } -__skb_insert (skb, skb1, skb1->next, &tp->out_of_order_queue); +__skb_queue_after (&tp->out_of_order_queue, skb1, skb);/* And clean segments covered by new one as whole. */ while ((skb1 = skb->next) !=
@@ -4254,7 +4254,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,memcpy (nskb->head, skb->head, header);memcpy (nskb->cb, skb->cb,sizeof (skb->cb));TCP_SKB_CB (nskb)->seq =TCP_SKB_CB (nskb)->end_seq = start; -__skb_insert (nskb, skb->prev, skb, list); +__skb_queue_before (list, skb, nskb);skb_set_owner_r (nskb, sk);/* Copy data, releasing collapsed skbs. */
net/sctp/ulpqueue.c +2 -3
@@ -317,7 +317,7 @@ static void sctp_ulpq_store_reasm(struct sctp_ulpq *ulpq, }/* Insert before pos. */ -__skb_insert (sctp_event2skb (event), pos->prev, pos, &ulpq->reasm); +__skb_queue_before (&ulpq->reasm, pos,sctp_event2skb (event)); }
@@ -825,8 +825,7 @@ static void sctp_ulpq_store_ordered(struct sctp_ulpq *ulpq,/* Insert before pos. */ -__skb_insert (sctp_event2skb (event), pos->prev, pos, &ulpq->lobby); - +__skb_queue_before (&ulpq->lobby, pos,sctp_event2skb (event)); } static struct sctp_ulpevent *sctp_ulpq_order(struct sctp_ulpq *ulpq,
Signature · 1 line
1.5.6.5