Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 136ebf08 authored by Masahide NAKAMURA's avatar Masahide NAKAMURA Committed by David S. Miller
Browse files

[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: default avatarMasahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2371baa4

include/net/flow.h

+0 −4
Original line number Diff line number Diff line
@@ -67,20 +67,16 @@ struct flowi { 


		__be32		spi;



#ifdef CONFIG_IPV6_MIP6

		struct {

			__u8	type;

		} mht;

#endif

	} uli_u;

#define fl_ip_sport	uli_u.ports.sport

#define fl_ip_dport	uli_u.ports.dport

#define fl_icmp_type	uli_u.icmpt.type

#define fl_icmp_code	uli_u.icmpt.code

#define fl_ipsec_spi	uli_u.spi

#ifdef CONFIG_IPV6_MIP6

#define fl_mh_type	uli_u.mht.type

#endif

	__u32           secid;	/* used by xfrm; see secid.txt */

} __attribute__((__aligned__(BITS_PER_LONG/8)));

include/net/xfrm.h

+0 −2
Original line number Diff line number Diff line
@@ -509,11 +509,9 @@ __be16 xfrm_flowi_sport(struct flowi *fl) 
	case IPPROTO_ICMPV6:

		port = htons(fl->fl_icmp_type);

		break;

#ifdef CONFIG_IPV6_MIP6

	case IPPROTO_MH:

		port = htons(fl->fl_mh_type);

		break;

#endif

	default:

		port = 0;	/*XXX*/

	}

net/ipv6/ah6.c

+2 −2
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des 
bad:

	return;

}

#else

static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *destopt) {}

#endif



/**
@@ -189,10 +191,8 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) 
	while (exthdr.raw < end) {

		switch (nexthdr) {

		case NEXTHDR_DEST:

#ifdef CONFIG_IPV6_MIP6

			if (dir == XFRM_POLICY_OUT)

				ipv6_rearrange_destopt(iph, exthdr.opth);

#endif

		case NEXTHDR_HOP:

			if (!zero_out_mutable_opts(exthdr.opth)) {

				LIMIT_NETDEBUG(

net/ipv6/raw.c

+0 −4
Original line number Diff line number Diff line
@@ -611,9 +611,7 @@ static int rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg) 
	struct iovec *iov;

	u8 __user *type = NULL;

	u8 __user *code = NULL;

#ifdef CONFIG_IPV6_MIP6

	u8 len = 0;

#endif

	int probed = 0;

	int i;
@@ -646,7 +644,6 @@ static int rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg) 
				probed = 1;

			}

			break;

#ifdef CONFIG_IPV6_MIP6

		case IPPROTO_MH:

			if (iov->iov_base && iov->iov_len < 1)

				break;
@@ -660,7 +657,6 @@ static int rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg) 
				len += iov->iov_len;



			break;

#endif

		default:

			probed = 1;

			break;