diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 4 | ||||
-rw-r--r-- | net/core/flow.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 32a13772c1cb..e54acde839da 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -4775,8 +4775,8 @@ static int __init net_dev_init(void) | |||
4775 | 4775 | ||
4776 | dev_boot_phase = 0; | 4776 | dev_boot_phase = 0; |
4777 | 4777 | ||
4778 | open_softirq(NET_TX_SOFTIRQ, net_tx_action, NULL); | 4778 | open_softirq(NET_TX_SOFTIRQ, net_tx_action); |
4779 | open_softirq(NET_RX_SOFTIRQ, net_rx_action, NULL); | 4779 | open_softirq(NET_RX_SOFTIRQ, net_rx_action); |
4780 | 4780 | ||
4781 | hotcpu_notifier(dev_cpu_callback, 0); | 4781 | hotcpu_notifier(dev_cpu_callback, 0); |
4782 | dst_init(); | 4782 | dst_init(); |
diff --git a/net/core/flow.c b/net/core/flow.c index 19991175fdeb..5cf81052d044 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -298,7 +298,7 @@ void flow_cache_flush(void) | |||
298 | init_completion(&info.completion); | 298 | init_completion(&info.completion); |
299 | 299 | ||
300 | local_bh_disable(); | 300 | local_bh_disable(); |
301 | smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0); | 301 | smp_call_function(flow_cache_flush_per_cpu, &info, 0); |
302 | flow_cache_flush_tasklet((unsigned long)&info); | 302 | flow_cache_flush_tasklet((unsigned long)&info); |
303 | local_bh_enable(); | 303 | local_bh_enable(); |
304 | 304 | ||