diff options
| -rw-r--r-- | net/core/dev.c | 8 | ||||
| -rw-r--r-- | net/ipv4/ip_input.c | 4 | ||||
| -rw-r--r-- | net/ipv6/ip6_input.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index e06223b65674..722d50dbf8a4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -5014,7 +5014,7 @@ static void __netif_receive_skb_list_core(struct list_head *head, bool pfmemallo | |||
| 5014 | struct net_device *orig_dev = skb->dev; | 5014 | struct net_device *orig_dev = skb->dev; |
| 5015 | struct packet_type *pt_prev = NULL; | 5015 | struct packet_type *pt_prev = NULL; |
| 5016 | 5016 | ||
| 5017 | list_del(&skb->list); | 5017 | skb_list_del_init(skb); |
| 5018 | __netif_receive_skb_core(skb, pfmemalloc, &pt_prev); | 5018 | __netif_receive_skb_core(skb, pfmemalloc, &pt_prev); |
| 5019 | if (!pt_prev) | 5019 | if (!pt_prev) |
| 5020 | continue; | 5020 | continue; |
| @@ -5170,7 +5170,7 @@ static void netif_receive_skb_list_internal(struct list_head *head) | |||
| 5170 | INIT_LIST_HEAD(&sublist); | 5170 | INIT_LIST_HEAD(&sublist); |
| 5171 | list_for_each_entry_safe(skb, next, head, list) { | 5171 | list_for_each_entry_safe(skb, next, head, list) { |
| 5172 | net_timestamp_check(netdev_tstamp_prequeue, skb); | 5172 | net_timestamp_check(netdev_tstamp_prequeue, skb); |
| 5173 | list_del(&skb->list); | 5173 | skb_list_del_init(skb); |
| 5174 | if (!skb_defer_rx_timestamp(skb)) | 5174 | if (!skb_defer_rx_timestamp(skb)) |
| 5175 | list_add_tail(&skb->list, &sublist); | 5175 | list_add_tail(&skb->list, &sublist); |
| 5176 | } | 5176 | } |
| @@ -5181,7 +5181,7 @@ static void netif_receive_skb_list_internal(struct list_head *head) | |||
| 5181 | rcu_read_lock(); | 5181 | rcu_read_lock(); |
| 5182 | list_for_each_entry_safe(skb, next, head, list) { | 5182 | list_for_each_entry_safe(skb, next, head, list) { |
| 5183 | xdp_prog = rcu_dereference(skb->dev->xdp_prog); | 5183 | xdp_prog = rcu_dereference(skb->dev->xdp_prog); |
| 5184 | list_del(&skb->list); | 5184 | skb_list_del_init(skb); |
| 5185 | if (do_xdp_generic(xdp_prog, skb) == XDP_PASS) | 5185 | if (do_xdp_generic(xdp_prog, skb) == XDP_PASS) |
| 5186 | list_add_tail(&skb->list, &sublist); | 5186 | list_add_tail(&skb->list, &sublist); |
| 5187 | } | 5187 | } |
| @@ -5200,7 +5200,7 @@ static void netif_receive_skb_list_internal(struct list_head *head) | |||
| 5200 | 5200 | ||
| 5201 | if (cpu >= 0) { | 5201 | if (cpu >= 0) { |
| 5202 | /* Will be handled, remove from list */ | 5202 | /* Will be handled, remove from list */ |
| 5203 | list_del(&skb->list); | 5203 | skb_list_del_init(skb); |
| 5204 | enqueue_to_backlog(skb, cpu, &rflow->last_qtail); | 5204 | enqueue_to_backlog(skb, cpu, &rflow->last_qtail); |
| 5205 | } | 5205 | } |
| 5206 | } | 5206 | } |
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 35a786c0aaa0..e609b08c9df4 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c | |||
| @@ -547,7 +547,7 @@ static void ip_list_rcv_finish(struct net *net, struct sock *sk, | |||
| 547 | list_for_each_entry_safe(skb, next, head, list) { | 547 | list_for_each_entry_safe(skb, next, head, list) { |
| 548 | struct dst_entry *dst; | 548 | struct dst_entry *dst; |
| 549 | 549 | ||
| 550 | list_del(&skb->list); | 550 | skb_list_del_init(skb); |
| 551 | /* if ingress device is enslaved to an L3 master device pass the | 551 | /* if ingress device is enslaved to an L3 master device pass the |
| 552 | * skb to its handler for processing | 552 | * skb to its handler for processing |
| 553 | */ | 553 | */ |
| @@ -594,7 +594,7 @@ void ip_list_rcv(struct list_head *head, struct packet_type *pt, | |||
| 594 | struct net_device *dev = skb->dev; | 594 | struct net_device *dev = skb->dev; |
| 595 | struct net *net = dev_net(dev); | 595 | struct net *net = dev_net(dev); |
| 596 | 596 | ||
| 597 | list_del(&skb->list); | 597 | skb_list_del_init(skb); |
| 598 | skb = ip_rcv_core(skb, net); | 598 | skb = ip_rcv_core(skb, net); |
| 599 | if (skb == NULL) | 599 | if (skb == NULL) |
| 600 | continue; | 600 | continue; |
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 96577e742afd..c1d85830c906 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
| @@ -95,7 +95,7 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk, | |||
| 95 | list_for_each_entry_safe(skb, next, head, list) { | 95 | list_for_each_entry_safe(skb, next, head, list) { |
| 96 | struct dst_entry *dst; | 96 | struct dst_entry *dst; |
| 97 | 97 | ||
| 98 | list_del(&skb->list); | 98 | skb_list_del_init(skb); |
| 99 | /* if ingress device is enslaved to an L3 master device pass the | 99 | /* if ingress device is enslaved to an L3 master device pass the |
| 100 | * skb to its handler for processing | 100 | * skb to its handler for processing |
| 101 | */ | 101 | */ |
| @@ -296,7 +296,7 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt, | |||
| 296 | struct net_device *dev = skb->dev; | 296 | struct net_device *dev = skb->dev; |
| 297 | struct net *net = dev_net(dev); | 297 | struct net *net = dev_net(dev); |
| 298 | 298 | ||
| 299 | list_del(&skb->list); | 299 | skb_list_del_init(skb); |
| 300 | skb = ip6_rcv_core(skb, dev, net); | 300 | skb = ip6_rcv_core(skb, dev, net); |
| 301 | if (skb == NULL) | 301 | if (skb == NULL) |
| 302 | continue; | 302 | continue; |
