From d3ac96ffa2678522ff9a5f687abff7dd949a7ddd Mon Sep 17 00:00:00 2001
From: Luiz Capitulino <lcapitulino@mandriva.com.br>
Date: Mon, 14 Nov 2005 21:43:36 -0800
Subject: [PATCH] --- yaml --- r: 14253 b: refs/heads/master c:
 cb422c464bdaeeb3b9ad4539010e357bf1bd1745 h: refs/heads/master i:   14251:
 809b2ddbc656f3a62b0670cb8a9076631de9760d 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 ff9ff38b3b46..5b0814a9bc7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12da2a435c1e8b9abb780d928ccbf04fc3d860a7
+refs/heads/master: cb422c464bdaeeb3b9ad4539010e357bf1bd1745
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index 003fd99ff597..25757ade989f 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -287,7 +287,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,
 	{
 		struct ipv6_txoptions *opt;
 		if (optlen == 0)
-			optval = 0;
+			optval = NULL;
 
 		/* hop-by-hop / destination options are privileged option */
 		retv = -EPERM;