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

Commit 8c14b7ce authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6] ADDRCONF: Statically link __ipv6_addr_type() for sunrpc subsystem. 



Link __ipv6_addr_type() statically for sunrpc code even if IPv6 is
built as module.

Signed-off-by: default avatarYOSHIFUJI Hidaki <yoshfuji@linux-ipv6.org>
parent f4b9479d

net/ipv6/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,6 @@ obj-$(CONFIG_NETFILTER) += netfilter/ 
obj-$(CONFIG_IPV6_SIT) += sit.o

obj-$(CONFIG_IPV6_SIT) += sit.o

obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o

obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o





obj-y += exthdrs_core.o

obj-y += addrconf_core.o exthdrs_core.o





obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
 
obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o

net/ipv6/addrconf.c

+0 −68
Original line number Original line Diff line number Diff line
@@ -211,74 +211,6 @@ const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; 
#endif

#endif

const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;

const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;





#define IPV6_ADDR_SCOPE_TYPE(scope)	((scope) << 16)



static inline unsigned ipv6_addr_scope2type(unsigned scope)

{

	switch(scope) {

	case IPV6_ADDR_SCOPE_NODELOCAL:

		return (IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_NODELOCAL) |

			IPV6_ADDR_LOOPBACK);

	case IPV6_ADDR_SCOPE_LINKLOCAL:

		return (IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL) |

			IPV6_ADDR_LINKLOCAL);

	case IPV6_ADDR_SCOPE_SITELOCAL:

		return (IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_SITELOCAL) |

			IPV6_ADDR_SITELOCAL);

	}

	return IPV6_ADDR_SCOPE_TYPE(scope);

}



int __ipv6_addr_type(const struct in6_addr *addr)

{

	__be32 st;



	st = addr->s6_addr32[0];



	/* Consider all addresses with the first three bits different of

	   000 and 111 as unicasts.

	 */

	if ((st & htonl(0xE0000000)) != htonl(0x00000000) &&

	    (st & htonl(0xE0000000)) != htonl(0xE0000000))

		return (IPV6_ADDR_UNICAST |

			IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));



	if ((st & htonl(0xFF000000)) == htonl(0xFF000000)) {

		/* multicast */

		/* addr-select 3.1 */

		return (IPV6_ADDR_MULTICAST |

			ipv6_addr_scope2type(IPV6_ADDR_MC_SCOPE(addr)));

	}



	if ((st & htonl(0xFFC00000)) == htonl(0xFE800000))

		return (IPV6_ADDR_LINKLOCAL | IPV6_ADDR_UNICAST |

			IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL));		/* addr-select 3.1 */

	if ((st & htonl(0xFFC00000)) == htonl(0xFEC00000))

		return (IPV6_ADDR_SITELOCAL | IPV6_ADDR_UNICAST |

			IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_SITELOCAL));		/* addr-select 3.1 */



	if ((addr->s6_addr32[0] | addr->s6_addr32[1]) == 0) {

		if (addr->s6_addr32[2] == 0) {

			if (addr->s6_addr32[3] == 0)

				return IPV6_ADDR_ANY;



			if (addr->s6_addr32[3] == htonl(0x00000001))

				return (IPV6_ADDR_LOOPBACK | IPV6_ADDR_UNICAST |

					IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL));	/* addr-select 3.4 */



			return (IPV6_ADDR_COMPATv4 | IPV6_ADDR_UNICAST |

				IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.3 */

		}



		if (addr->s6_addr32[2] == htonl(0x0000ffff))

			return (IPV6_ADDR_MAPPED |

				IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.3 */

	}



	return (IPV6_ADDR_RESERVED |

		IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.4 */

}



static void addrconf_del_timer(struct inet6_ifaddr *ifp)

static void addrconf_del_timer(struct inet6_ifaddr *ifp)

{

{

	if (del_timer(&ifp->timer))

	if (del_timer(&ifp->timer))

net/ipv6/addrconf_core.c

0 → 100644
+75 −0
Original line number Original line Diff line number Diff line 
/*

 * IPv6 library code, needed by static components when full IPv6 support is

 * not configured or static.

 */



#include <net/ipv6.h>



#define IPV6_ADDR_SCOPE_TYPE(scope)	((scope) << 16)



static inline unsigned ipv6_addr_scope2type(unsigned scope)

{

	switch(scope) {

	case IPV6_ADDR_SCOPE_NODELOCAL:

		return (IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_NODELOCAL) |

			IPV6_ADDR_LOOPBACK);

	case IPV6_ADDR_SCOPE_LINKLOCAL:

		return (IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL) |

			IPV6_ADDR_LINKLOCAL);

	case IPV6_ADDR_SCOPE_SITELOCAL:

		return (IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_SITELOCAL) |

			IPV6_ADDR_SITELOCAL);

	}

	return IPV6_ADDR_SCOPE_TYPE(scope);

}



int __ipv6_addr_type(const struct in6_addr *addr)

{

	__be32 st;



	st = addr->s6_addr32[0];



	/* Consider all addresses with the first three bits different of

	   000 and 111 as unicasts.

	 */

	if ((st & htonl(0xE0000000)) != htonl(0x00000000) &&

	    (st & htonl(0xE0000000)) != htonl(0xE0000000))

		return (IPV6_ADDR_UNICAST |

			IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));



	if ((st & htonl(0xFF000000)) == htonl(0xFF000000)) {

		/* multicast */

		/* addr-select 3.1 */

		return (IPV6_ADDR_MULTICAST |

			ipv6_addr_scope2type(IPV6_ADDR_MC_SCOPE(addr)));

	}



	if ((st & htonl(0xFFC00000)) == htonl(0xFE800000))

		return (IPV6_ADDR_LINKLOCAL | IPV6_ADDR_UNICAST |

			IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL));		/* addr-select 3.1 */

	if ((st & htonl(0xFFC00000)) == htonl(0xFEC00000))

		return (IPV6_ADDR_SITELOCAL | IPV6_ADDR_UNICAST |

			IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_SITELOCAL));		/* addr-select 3.1 */



	if ((addr->s6_addr32[0] | addr->s6_addr32[1]) == 0) {

		if (addr->s6_addr32[2] == 0) {

			if (addr->s6_addr32[3] == 0)

				return IPV6_ADDR_ANY;



			if (addr->s6_addr32[3] == htonl(0x00000001))

				return (IPV6_ADDR_LOOPBACK | IPV6_ADDR_UNICAST |

					IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_LINKLOCAL));	/* addr-select 3.4 */



			return (IPV6_ADDR_COMPATv4 | IPV6_ADDR_UNICAST |

				IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.3 */

		}



		if (addr->s6_addr32[2] == htonl(0x0000ffff))

			return (IPV6_ADDR_MAPPED |

				IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.3 */

	}



	return (IPV6_ADDR_RESERVED |

		IPV6_ADDR_SCOPE_TYPE(IPV6_ADDR_SCOPE_GLOBAL));	/* addr-select 3.4 */

}