aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/raw.c
diff options
context:
space:
mode:
authorMasahide NAKAMURA <nakam@linux-ipv6.org>2007-06-27 02:51:41 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-11 01:15:41 -0400
commit136ebf08b46f839e2dc9db34322b654e5d9b9936 (patch)
tree6a38a3c546def150ff73effcf4afd9c55881f49c /net/ipv6/raw.c
parent2371baa4bdab3268b32009926f75e7a5d3a41506 (diff)
[IPV6] MIP6: Kill unnecessary ifdefs.
Kill unnecessary CONFIG_IPV6_MIP6. o It is redundant for RAW socket to keep MH out with the config then it can handle any protocol. o Clean-up at AH. Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r--net/ipv6/raw.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index a58459a76684..a22c9c93d931 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -611,9 +611,7 @@ static int rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
611 struct iovec *iov; 611 struct iovec *iov;
612 u8 __user *type = NULL; 612 u8 __user *type = NULL;
613 u8 __user *code = NULL; 613 u8 __user *code = NULL;
614#ifdef CONFIG_IPV6_MIP6
615 u8 len = 0; 614 u8 len = 0;
616#endif
617 int probed = 0; 615 int probed = 0;
618 int i; 616 int i;
619 617
@@ -646,7 +644,6 @@ static int rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
646 probed = 1; 644 probed = 1;
647 } 645 }
648 break; 646 break;
649#ifdef CONFIG_IPV6_MIP6
650 case IPPROTO_MH: 647 case IPPROTO_MH:
651 if (iov->iov_base && iov->iov_len < 1) 648 if (iov->iov_base && iov->iov_len < 1)
652 break; 649 break;
@@ -660,7 +657,6 @@ static int rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
660 len += iov->iov_len; 657 len += iov->iov_len;
661 658
662 break; 659 break;
663#endif
664 default: 660 default:
665 probed = 1; 661 probed = 1;
666 break; 662 break;