[IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.

Because reversing RH0 is no longer supported by deprecation
of RH0, let's make IPV6_{RECV,2292}RTHDR boolean options.
Boolean are more appropriate from standard POV.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 8 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index cb3118cf27..97983dc9df 100644
--- a/include/linux/ipv6.h
+++ b/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/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 1841714ac4..d684639318 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/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;