diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-06-16 18:25:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-16 18:25:48 -0700 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /net/sctp/protocol.c | |
| parent | netns: introduce the net_hash_mix "salt" for hashes (diff) | |
| parent | atm: [he] send idle cells instead of unassigned when in SDH mode (diff) | |
| download | linux-dev-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.tar.xz linux-dev-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'net/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index d6af466091d2..23aaffb97ca3 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -108,16 +108,27 @@ static __init int sctp_proc_init(void) } if (sctp_snmp_proc_init()) - goto out_nomem; + goto out_snmp_proc_init; if (sctp_eps_proc_init()) - goto out_nomem; + goto out_eps_proc_init; if (sctp_assocs_proc_init()) - goto out_nomem; + goto out_assocs_proc_init; if (sctp_remaddr_proc_init()) - goto out_nomem; + goto out_remaddr_proc_init; return 0; +out_remaddr_proc_init: + sctp_remaddr_proc_exit(); +out_assocs_proc_init: + sctp_eps_proc_exit(); +out_eps_proc_init: + sctp_snmp_proc_exit(); +out_snmp_proc_init: + if (proc_net_sctp) { + proc_net_sctp = NULL; + remove_proc_entry("sctp", init_net.proc_net); + } out_nomem: return -ENOMEM; } |