From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH] dccp: Fix compile warning in probe code.
Date: Fri, 2 Dec 2011 19:52:05 -0700 [thread overview]
Message-ID: <20111203025205.GA4437@gerrit.erg.abdn.ac.uk> (raw)
In-Reply-To: <20111201.144650.173157123252154314.davem@davemloft.net>
Acked-by: Gerrit Renker <gerrit@erg.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
|
|
--
prev parent reply other threads:[~2011-12-03 2:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-01 19:46 [PATCH] dccp: Fix compile warning in probe code David Miller
2011-12-03 2:52 ` Gerrit Renker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111203025205.GA4437@gerrit.erg.abdn.ac.uk \
--to=gerrit@erg.abdn.ac.uk \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).