Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184520
b: refs/heads/master
c: e5e26d7
h: refs/heads/master
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Feb 26, 2010
1 parent 3ebdbe0 commit 8ac7c3f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4edb246626be6e031950205c885bdf29fb2ff1eb
refs/heads/master: e5e26d75f490d7d41f25a4b39ed6db1713beb417
6 changes: 3 additions & 3 deletions trunk/net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@ static void net_rx_action(struct softirq_action *h)
* entries to the tail of this list, and only ->poll()
* calls can remove this head entry from the list.
*/
n = list_entry(list->next, struct napi_struct, poll_list);
n = list_first_entry(list, struct napi_struct, poll_list);

have = netpoll_poll_lock(n);

Expand Down Expand Up @@ -4882,7 +4882,7 @@ static void rollback_registered_many(struct list_head *head)
}

/* Process any work delayed until the end of the batch */
dev = list_entry(head->next, struct net_device, unreg_list);
dev = list_first_entry(head, struct net_device, unreg_list);
call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);

synchronize_net();
Expand Down Expand Up @@ -5268,7 +5268,7 @@ void netdev_run_todo(void)

while (!list_empty(&list)) {
struct net_device *dev
= list_entry(list.next, struct net_device, todo_list);
= list_first_entry(&list, struct net_device, todo_list);
list_del(&dev->todo_list);

if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) {
Expand Down

0 comments on commit 8ac7c3f

Please sign in to comment.