[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20111203025205.GA4437@gerrit.erg.abdn.ac.uk>
Date: Fri, 2 Dec 2011 19:52:05 -0700
From: Gerrit Renker <gerrit@....abdn.ac.uk>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH] dccp: Fix compile warning in probe code.
Acked-by: Gerrit Renker <gerrit@....abdn.ac.uk>
I have compiled and tested this and added the patch to the test tree.
Thanks for the improvement.
| --- a/net/dccp/probe.c
| +++ b/net/dccp/probe.c
| @@ -152,6 +152,17 @@ static const struct file_operations dccpprobe_fops = {
| .llseek = noop_llseek,
| };
|
| +static __init int setup_jprobe(void)
| +{
| + int ret = register_jprobe(&dccp_send_probe);
| +
| + if (ret) {
| + request_module("dccp");
| + ret = register_jprobe(&dccp_send_probe);
| + }
| + return ret;
| +}
| +
| static __init int dccpprobe_init(void)
| {
| int ret = -ENOMEM;
| @@ -163,8 +174,7 @@ static __init int dccpprobe_init(void)
| if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
| goto err0;
|
| - try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0,
| - "dccp");
| + ret = setup_jprobe();
| if (ret)
| goto err1;
|
| --
| 1.7.7.3
|
|
--
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists