diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-02-02 20:16:56 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-09-18 13:52:18 +0200 |
| commit | c5e8459bd607a2b7c9a86ae4414f32ce3a7b3b62 (patch) | |
| tree | 2cd740139a73dc9f97489b6fc6a01c2a07902ccd | |
| parent | 9b2aa6e28493bfa3a94ecaa8486937b568df0e31 (diff) | |
dccp: fix auto-loading of dccp(_probe)
commit 1386be55e32a3c5d8ef4a2b243c530a7b664c02c upstream.
This fixes commit (38ff3e6bb987ec583268da8eb22628293095d43b) ("dccp_probe:
Fix module load dependencies between dccp and dccp_probe", from 15 Jan).
It fixes the construction of the first argument of try_then_request_module(),
where only valid return codes from the first argument should be returned.
What we do now is assign the result of register_jprobe() to ret, without
the side effect of the comparison.
Acked-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/dccp/probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 48759983b2db..3ba43b8c7617 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -164,8 +164,8 @@ static __init int dccpprobe_init(void) if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops)) goto err0; - ret = try_then_request_module((register_jprobe(&dccp_send_probe) == 0), - "dccp"); + try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0, + "dccp"); if (ret) goto err1; |