ipv6: remove old conditions on flow label sharing (b579035f) · Commits · 戴 / test

The code of flow label in Linux Kernel follows the rules of RFC 1809 (an informational one) for conditions on flow label sharing. There rules are not in the last proposed standard for flow label (RFC 6437), or in the previous one (RFC 3697). Since this code does not follow any current or old standard, we can remove it. With this removal, the ipv6_opt_cmp function is now a dead code and it can be removed too. Changelog to v1: * add justification for the change * remove the condition on IPv6 options [ Remove ipv6_hdr_cmp and it is now unused as well. -DaveM ] Signed-off-by:

Florent Fourcot <florent.fourcot@enst-bretagne.fr> Acked-by:

Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv6/ip6_flowlabel.c

+0 −33

Original line number	Diff line number	Diff line
		@@ -465,34 +465,6 @@ static int mem_check(struct sock *sk)
		return 0;
		}

		static bool ipv6_hdr_cmp(struct ipv6_opt_hdr h1, struct ipv6_opt_hdr h2)
		{
		if (h1 == h2)
		return false;
		if (h1 == NULL \|\| h2 == NULL)
		return true;
		if (h1->hdrlen != h2->hdrlen)
		return true;
		return memcmp(h1+1, h2+1, ((h1->hdrlen+1)<<3) - sizeof(*h1));
		}

		static bool ipv6_opt_cmp(struct ipv6_txoptions o1, struct ipv6_txoptions o2)
		{
		if (o1 == o2)
		return false;
		if (o1 == NULL \|\| o2 == NULL)
		return true;
		if (o1->opt_nflen != o2->opt_nflen)
		return true;
		if (ipv6_hdr_cmp(o1->hopopt, o2->hopopt))
		return true;
		if (ipv6_hdr_cmp(o1->dst0opt, o2->dst0opt))
		return true;
		if (ipv6_hdr_cmp((struct ipv6_opt_hdr )o1->srcrt, (struct ipv6_opt_hdr )o2->srcrt))
		return true;
		return false;
		}

		static inline void fl_link(struct ipv6_pinfo np, struct ipv6_fl_socklist sfl,
		struct ip6_flowlabel *fl)
		{
		@@ -603,11 +575,6 @@ recheck:
		uid_eq(fl1->owner.uid, fl->owner.uid)))
		goto release;

		err = -EINVAL;
		if (!ipv6_addr_equal(&fl1->dst, &fl->dst) \|\|
		ipv6_opt_cmp(fl1->opt, fl->opt))
		goto release;

		err = -ENOMEM;
		if (sfl1 == NULL)
		goto release;

Admin message