Skip to content

L
linux-davinci
Commit f72051b0 authored by David S. Miller's avatar David S. Miller
Browse files
Options

neigh: Remove by-hand SKB queue handling. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4ab5432
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 13 deletions
net/core/neighbour.c
View file @ f72051b0
...@@ -927,8 +927,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) ...@@ -927,8 +927,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
if (skb_queue_len(&neigh->arp_queue) >= if (skb_queue_len(&neigh->arp_queue) >=
neigh->parms->queue_len) { neigh->parms->queue_len) {
struct sk_buff *buff; struct sk_buff *buff;
buff = neigh->arp_queue.next; buff = __skb_dequeue(&neigh->arp_queue);
__skb_unlink(buff, &neigh->arp_queue);
kfree_skb(buff); kfree_skb(buff);
NEIGH_CACHE_STAT_INC(neigh->tbl, unres_discards); NEIGH_CACHE_STAT_INC(neigh->tbl, unres_discards);
} }
...@@ -1259,24 +1258,20 @@ static void neigh_proxy_process(unsigned long arg) ...@@ -1259,24 +1258,20 @@ static void neigh_proxy_process(unsigned long arg)
struct neigh_table *tbl = (struct neigh_table *)arg; struct neigh_table *tbl = (struct neigh_table *)arg;
long sched_next = 0; long sched_next = 0;
unsigned long now = jiffies; unsigned long now = jiffies;
struct sk_buff *skb; struct sk_buff *skb, *n;
spin_lock(&tbl->proxy_queue.lock); spin_lock(&tbl->proxy_queue.lock);
skb = tbl->proxy_queue.next; skb_queue_walk_safe(&tbl->proxy_queue, skb, n) {
long tdif = NEIGH_CB(skb)->sched_next - now;
while (skb != (struct sk_buff *)&tbl->proxy_queue) {
struct sk_buff *back = skb;
long tdif = NEIGH_CB(back)->sched_next - now;
skb = skb->next;
if (tdif <= 0) { if (tdif <= 0) {
struct net_device *dev = back->dev; struct net_device *dev = skb->dev;
__skb_unlink(back, &tbl->proxy_queue); __skb_unlink(skb, &tbl->proxy_queue);
if (tbl->proxy_redo && netif_running(dev)) if (tbl->proxy_redo && netif_running(dev))
tbl->proxy_redo(back); tbl->proxy_redo(skb);
else else
kfree_skb(back); kfree_skb(skb);
dev_put(dev); dev_put(dev);
} else if (!sched_next || tdif < sched_next) } else if (!sched_next || tdif < sched_next)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment