diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-06 00:14:19 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-06 00:14:19 +0300 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /net/core/dev.c | |
| parent | 8f4043f1253292495dbf9c8be0c1b07b4b9902b7 (diff) | |
| parent | 7f46774c6480174eb869a3c15167eafac467a6af (diff) | |
| download | linux-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a95782764360..b430f851f377 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5017,8 +5017,10 @@ static inline void __netif_receive_skb_list_ptype(struct list_head *head, if (pt_prev->list_func != NULL) pt_prev->list_func(head, pt_prev, orig_dev); else - list_for_each_entry_safe(skb, next, head, list) + list_for_each_entry_safe(skb, next, head, list) { + skb_list_del_init(skb); pt_prev->func(skb, skb->dev, pt_prev, orig_dev); + } } static void __netif_receive_skb_list_core(struct list_head *head, bool pfmemalloc) |