From 4171be085e405a1c52f6fc81a25070184a0d9388 Mon Sep 17 00:00:00 2001 From: Yang Hongyang Date: Wed, 28 May 2008 16:27:28 +0800 Subject: [PATCH] --- yaml --- r: 97664 b: refs/heads/master c: 95b496b66615d8c43f77702049b1bd01e2f06595 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/ipv6_sockglue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 29c03670f9a9..de4e7bc26518 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05335c2220c4911b69cb1bdd79e603ab08088372 +refs/heads/master: 95b496b66615d8c43f77702049b1bd01e2f06595 diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c index aa7bedf780e5..9293b9f0ac23 100644 --- a/trunk/net/ipv6/ipv6_sockglue.c +++ b/trunk/net/ipv6/ipv6_sockglue.c @@ -832,7 +832,7 @@ static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_txoptions *opt, len = min_t(unsigned int, len, ipv6_optlen(hdr)); if (copy_to_user(optval, hdr, len)) return -EFAULT; - return ipv6_optlen(hdr); + return len; } static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,