diff options
| author |  David S. Miller <davem@davemloft.net>
| 2015-02-09 14:35:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2015-02-09 14:35:57 -0800 |
| commit | 2573beec56aa28a0e6d4430fb6796d0c76308bcf (patch) | |
| tree | 15c902551b78a954d5138304b97a16a4d9968202 /net/core/dev.c | |
| parent | openvswitch: Only set TUNNEL_VXLAN_OPT if VXLAN-GBP metadata is set (diff) | |
| parent | tcp: don't include Fast Open option in SYN-ACK on pure SYN-data (diff) | |
| download | linux-2573beec56aa28a0e6d4430fb6796d0c76308bcf.tar.gz linux-2573beec56aa28a0e6d4430fb6796d0c76308bcf.tar.bz2 linux-2573beec56aa28a0e6d4430fb6796d0c76308bcf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/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, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 8be38675e1a8..d030575532a2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7129,11 +7129,11 @@ static int dev_cpu_callback(struct notifier_block *nfb, /* Process offline CPU's input_pkt_queue */ while ((skb = __skb_dequeue(&oldsd->process_queue))) { - netif_rx_internal(skb); + netif_rx_ni(skb); input_queue_head_incr(oldsd); } while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) { - netif_rx_internal(skb); + netif_rx_ni(skb); input_queue_head_incr(oldsd); } |