[NETFILTER]: fix compat_nf_sockopt typo

[NETFILTER]: fix compat_nf_sockopt typo

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1243 bytes --]

[NETFILTER]: fix compat_nf_sockopt typo

It should pass opt to the ->get/->set functions, not ops.

Tested-by: Luca Tettamanti <kronos.it@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit 65ad145a53233f4ddd3021ad23e8407137c9207c
tree a6633e33307b5ec1e11fedc2d0e125ed6e2bd081
parent 99fee6d7e5748d96884667a4628118f7fc130ea0
author Patrick McHardy <kaber@trash.net> Thu, 15 Nov 2007 22:57:57 +0100
committer Patrick McHardy <kaber@trash.net> Thu, 15 Nov 2007 22:57:57 +0100

 net/netfilter/nf_sockopt.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
index 87bc144..3dd4b3c 100644
--- a/net/netfilter/nf_sockopt.c
+++ b/net/netfilter/nf_sockopt.c
@@ -143,12 +143,12 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val,
 		if (ops->compat_get)
 			ret = ops->compat_get(sk, val, opt, len);
 		else
-			ret = ops->get(sk, val, ops, len);
+			ret = ops->get(sk, val, opt, len);
 	} else {
 		if (ops->compat_set)
-			ret = ops->compat_set(sk, val, ops, *len);
+			ret = ops->compat_set(sk, val, opt, *len);
 		else
-			ret = ops->set(sk, val, ops, *len);
+			ret = ops->set(sk, val, opt, *len);
 	}
 
 	module_put(ops->owner);

Re: [NETFILTER]: fix compat_nf_sockopt typo

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Thu, 15 Nov 2007 22:58:37 +0100

> [NETFILTER]: fix compat_nf_sockopt typo
> 
> It should pass opt to the ->get/->set functions, not ops.
> 
> Tested-by: Luca Tettamanti <kronos.it@gmail.com>
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Applied, thanks a lot Patrick.

I double checked and it seems -stable doesn't need this,
only 2.6.24

Let me know if my analysis is incorrect.

Thanks again.