diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:59:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:59:46 -0400 |
| commit | ff3ea47c623276e9772cbc268471224648d5a7fe (patch) | |
| tree | ecb77b11659f85abefed71aa075d4f879a7cc116 /drivers/net/netconsole.c | |
| parent | a8c725045eb2eaa6c28a5493cb193f47a5c4afe4 (diff) | |
| parent | 36485707bbd9729e0c52315b173aeed9bc2303dd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: fix locking and memory leak in br_add_bridge
[IRDA]: Missing allocation result check in irlap_change_speed().
[PPPOE]: Missing result check in __pppoe_xmit().
[NET]: Eliminate unused /proc/sys/net/ethernet
[NETCONSOLE]: Clean up initcall warning.
[TCP]: Avoid skb_pull if possible when trimming head
Diffstat (limited to 'drivers/net/netconsole.c')
| -rw-r--r-- | drivers/net/netconsole.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 66e74f740261..bf58db29e2ed 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
| @@ -107,7 +107,7 @@ static int init_netconsole(void) | |||
| 107 | 107 | ||
| 108 | if(!configured) { | 108 | if(!configured) { |
| 109 | printk("netconsole: not configured, aborting\n"); | 109 | printk("netconsole: not configured, aborting\n"); |
| 110 | return -EINVAL; | 110 | return 0; |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | if(netpoll_setup(&np)) | 113 | if(netpoll_setup(&np)) |