summaryrefslogtreecommitdiffstats
path: root/net/sctp/probe.c
diff options
context:
space:
mode:
authorwangweidong <wangweidong1@huawei.com>2013-12-13 11:00:10 +0800
committerDavid S. Miller <davem@davemloft.net>2013-12-16 20:04:27 -0500
commit9bd7d20c45157c175bfd45449e904a404506f99c (patch)
tree8cbe47b31c0b14e9e2df595137e187ad4b21391f /net/sctp/probe.c
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadlinux-9bd7d20c45157c175bfd45449e904a404506f99c.tar.gz
linux-9bd7d20c45157c175bfd45449e904a404506f99c.tar.bz2
linux-9bd7d20c45157c175bfd45449e904a404506f99c.zip
sctp: loading sctp when load sctp_probe
when I modprobe sctp_probe, it failed with "FATAL: ". I found that sctp should load before sctp_probe register jprobe. So I add a sctp_setup_jprobe for loading 'sctp' when first failed to register jprobe, just do this similar to dccp_probe. v2: add MODULE_SOFTDEP and check of request_module, as suggested by Neil Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/probe.c')
-rw-r--r--net/sctp/probe.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/net/sctp/probe.c b/net/sctp/probe.c
index 53c452efb40b..5e68b94ee640 100644
--- a/net/sctp/probe.c
+++ b/net/sctp/probe.c
@@ -38,6 +38,7 @@
#include <net/sctp/sctp.h>
#include <net/sctp/sm.h>
+MODULE_SOFTDEP("pre: sctp");
MODULE_AUTHOR("Wei Yongjun <yjwei@cn.fujitsu.com>");
MODULE_DESCRIPTION("SCTP snooper");
MODULE_LICENSE("GPL");
@@ -182,6 +183,20 @@ static struct jprobe sctp_recv_probe = {
.entry = jsctp_sf_eat_sack,
};
+static __init int sctp_setup_jprobe(void)
+{
+ int ret = register_jprobe(&sctp_recv_probe);
+
+ if (ret) {
+ if (request_module("sctp"))
+ goto out;
+ ret = register_jprobe(&sctp_recv_probe);
+ }
+
+out:
+ return ret;
+}
+
static __init int sctpprobe_init(void)
{
int ret = -ENOMEM;
@@ -202,7 +217,7 @@ static __init int sctpprobe_init(void)
&sctpprobe_fops))
goto free_kfifo;
- ret = register_jprobe(&sctp_recv_probe);
+ ret = sctp_setup_jprobe();
if (ret)
goto remove_proc;