diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 03:59:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 03:59:38 +0300 |
| commit | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (patch) | |
| tree | 0ec4807d49a602ba785e60e5352b542f1581d4c9 /net/ipv6/ipv6_sockglue.c | |
| parent | fb6d73d3014babb69f5cc2d1d78b31e9d09fc5df (diff) | |
| parent | 5a6f294e43e432bd207a702fea49ebb303ef9b23 (diff) | |
| download | linux-f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 003fd99ff597..25757ade989f 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/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; |