summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 15:28:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 15:28:42 -0700
commit666484f0250db2e016948d63b3ef33e202e3b8d0 (patch)
tree734f48c10aa364965e4f4642ee3de51669e62be2 /net
parentd18bb9a548e550f3ced57618e75085fb3f173133 (diff)
parentace7f1b79670aa0c1d9f4b0442be82e565827333 (diff)
downloadop-kernel-dev-666484f0250db2e016948d63b3ef33e202e3b8d0.zip
op-kernel-dev-666484f0250db2e016948d63b3ef33e202e3b8d0.tar.gz
Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softirq: remove irqs_disabled warning from local_bh_enable softirq: remove initialization of static per-cpu variable Remove argument from open_softirq which is always NULL
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index fca23a3..821cb16 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4585,8 +4585,8 @@ static int __init net_dev_init(void)
dev_boot_phase = 0;
- open_softirq(NET_TX_SOFTIRQ, net_tx_action, NULL);
- open_softirq(NET_RX_SOFTIRQ, net_rx_action, NULL);
+ open_softirq(NET_TX_SOFTIRQ, net_tx_action);
+ open_softirq(NET_RX_SOFTIRQ, net_rx_action);
hotcpu_notifier(dev_cpu_callback, 0);
dst_init();
OpenPOWER on IntegriCloud