adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: Remove __skb_insert() calls outside of skbuff internals.

Browse source 
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 <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-09-21 21:28:51 -07:00
parent f5fff5dc8a
commit 43f59c8939
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/cassini.c
View file

@ -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 * do any additional locking here. stick the buffer
* at the end. * 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) { if (words[0] & RX_COMP1_RELEASE_FLOW) {
while ((skb = __skb_dequeue(flow))) { while ((skb = __skb_dequeue(flow))) {
cas_skb_release(skb); cas_skb_release(skb);

2
drivers/net/ppp_generic.c
View file

@ -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) for (p = list->next; p != (struct sk_buff *)list; p = p->next)
if (seq_before(seq, p->sequence)) if (seq_before(seq, p->sequence))
break; break;
__skb_insert(skb, p->prev, p, list); __skb_queue_before(list, p, skb);
} }
/* /*

2
drivers/net/pppol2tp.c
View file

@ -353,7 +353,7 @@ static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_
spin_lock_bh(&session->reorder_q.lock); spin_lock_bh(&session->reorder_q.lock);
skb_queue_walk_safe(&session->reorder_q, skbp, tmp) { skb_queue_walk_safe(&session->reorder_q, skbp, tmp) {
if (PPPOL2TP_SKB_CB(skbp)->ns > ns) { 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, PRINTK(session->debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG,
"%s: pkt %hu, inserted before %hu, reorder_q len=%d\n", "%s: pkt %hu, inserted before %hu, reorder_q len=%d\n",
session->name, ns, PPPOL2TP_SKB_CB(skbp)->ns, session->name, ns, PPPOL2TP_SKB_CB(skbp)->ns,

4
include/net/tcp.h
View file

@ -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); __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, static inline void tcp_insert_write_queue_before(struct sk_buff *new,
struct sk_buff *skb, struct sk_buff *skb,
struct sock *sk) 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) if (sk->sk_send_head == skb)
sk->sk_send_head = new; sk->sk_send_head = new;

4
net/ipv4/tcp_input.c
View file

@ -4156,7 +4156,7 @@ drop:
skb1 = skb1->prev; 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. */ /* And clean segments covered by new one as whole. */
while ((skb1 = skb->next) != 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->head, skb->head, header);
memcpy(nskb->cb, skb->cb, sizeof(skb->cb)); memcpy(nskb->cb, skb->cb, sizeof(skb->cb));
TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(nskb)->end_seq = start; 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); skb_set_owner_r(nskb, sk);
/* Copy data, releasing collapsed skbs. */ /* Copy data, releasing collapsed skbs. */

5
net/sctp/ulpqueue.c
View file

@ -317,7 +317,7 @@ static void sctp_ulpq_store_reasm(struct sctp_ulpq *ulpq,
} }
/* Insert before pos. */ /* 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. */ /* 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, static struct sctp_ulpevent *sctp_ulpq_order(struct sctp_ulpq *ulpq,