From 70e8cfb1858f436c6226f21f21b920dd060ac6d9 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Wed, 23 May 2007 13:28:48 +0900 Subject: [PATCH] --- yaml --- r: 59041 b: refs/heads/master c: 4c752098f529f41abfc985426a3eca0f2cb96676 h: refs/heads/master i: 59039: 88f643a8800a6e3e6c1ba182a6995557890fa77e v: v3 --- [refs] | 2 +- trunk/include/linux/ipv6.h | 4 ++-- trunk/net/ipv6/ipv6_sockglue.c | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index de4283fa328b..463cfce9f166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb4dbf9e61d0801927e7df2569bb3dd8287ea301 +refs/heads/master: 4c752098f529f41abfc985426a3eca0f2cb96676 diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h index cb3118cf277c..97983dc9df13 100644 --- a/trunk/include/linux/ipv6.h +++ b/trunk/include/linux/ipv6.h @@ -299,8 +299,8 @@ struct ipv6_pinfo { /* pktoption flags */ union { struct { - __u16 srcrt:2, - osrcrt:2, + __u16 srcrt:1, + osrcrt:1, rxinfo:1, rxoinfo:1, rxhlim:1, diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c index 1841714ac419..d6846393182d 100644 --- a/trunk/net/ipv6/ipv6_sockglue.c +++ b/trunk/net/ipv6/ipv6_sockglue.c @@ -336,16 +336,12 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, break; case IPV6_RECVRTHDR: - if (val < 0 || val > 2) - goto e_inval; - np->rxopt.bits.srcrt = val; + np->rxopt.bits.srcrt = valbool; retv = 0; break; case IPV6_2292RTHDR: - if (val < 0 || val > 2) - goto e_inval; - np->rxopt.bits.osrcrt = val; + np->rxopt.bits.osrcrt = valbool; retv = 0; break;