git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cpus4096
[pandora-kernel.git]
/
net
/
core
/
dev.c
diff --git
a/net/core/dev.c
b/net/core/dev.c
index
94d9d6f
..
df5520a
100644
(file)
--- 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;
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();
hotcpu_notifier(dev_cpu_callback, 0);
dst_init();