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

Commit d1912747 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

rxrpc: Make IPv6 support conditional on CONFIG_IPV6 



Add CONFIG_AF_RXRPC_IPV6 and make the IPv6 support code conditional on it.
This is then made conditional on CONFIG_IPV6.

Without this, the following can be seen:

   net/built-in.o: In function `rxrpc_init_peer':
>> peer_object.c:(.text+0x18c3c8): undefined reference to `ip6_route_output_flags'

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84ce3da1

net/rxrpc/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ config AF_RXRPC 


	  See Documentation/networking/rxrpc.txt.



config AF_RXRPC_IPV6

	bool "IPv6 support for RxRPC"

	depends on (IPV6 = m && AF_RXRPC = m) || (IPV6 = y && AF_RXRPC)

	help

	  Say Y here to allow AF_RXRPC to use IPV6 UDP as well as IPV4 UDP as

	  its network transport.





config AF_RXRPC_DEBUG

	bool "RxRPC dynamic debugging"

net/rxrpc/af_rxrpc.c

+6 −1
Original line number Diff line number Diff line
@@ -109,12 +109,14 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx, 
		tail = offsetof(struct sockaddr_rxrpc, transport.sin.__pad);

		break;



#ifdef CONFIG_AF_RXRPC_IPV6

	case AF_INET6:

		if (srx->transport_len < sizeof(struct sockaddr_in6))

			return -EINVAL;

		tail = offsetof(struct sockaddr_rxrpc, transport) +

			sizeof(struct sockaddr_in6);

		break;

#endif



	default:

		return -EAFNOSUPPORT;
@@ -413,9 +415,11 @@ static int rxrpc_sendmsg(struct socket *sock, struct msghdr *m, size_t len) 
		case AF_INET:

			rx->srx.transport_len = sizeof(struct sockaddr_in);

			break;

#ifdef CONFIG_AF_RXRPC_IPV6

		case AF_INET6:

			rx->srx.transport_len = sizeof(struct sockaddr_in6);

			break;

#endif

		default:

			ret = -EAFNOSUPPORT;

			goto error_unlock;
@@ -570,7 +574,8 @@ static int rxrpc_create(struct net *net, struct socket *sock, int protocol, 
		return -EAFNOSUPPORT;



	/* we support transport protocol UDP/UDP6 only */

	if (protocol != PF_INET && protocol != PF_INET6)

	if (protocol != PF_INET &&

	    IS_ENABLED(CONFIG_AF_RXRPC_IPV6) && protocol != PF_INET6)

		return -EPROTONOSUPPORT;



	if (sock->type != SOCK_DGRAM)

net/rxrpc/conn_object.c

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local, 
			    srx.transport.sin.sin_addr.s_addr)

				goto not_found;

			break;

#ifdef CONFIG_AF_RXRPC_IPV6

		case AF_INET6:

			if (peer->srx.transport.sin6.sin6_port !=

			    srx.transport.sin6.sin6_port ||
@@ -142,6 +143,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local, 
				   sizeof(struct in6_addr)) != 0)

				goto not_found;

			break;

#endif

		default:

			BUG();

		}

net/rxrpc/local_object.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static long rxrpc_local_cmp_key(const struct rxrpc_local *local, 
			memcmp(&local->srx.transport.sin.sin_addr,

			       &srx->transport.sin.sin_addr,

			       sizeof(struct in_addr));

#ifdef CONFIG_AF_RXRPC_IPV6

	case AF_INET6:

		/* If the choice of UDP6 port is left up to the transport, then

		 * the endpoint record doesn't match.
@@ -67,6 +68,7 @@ static long rxrpc_local_cmp_key(const struct rxrpc_local *local, 
			memcmp(&local->srx.transport.sin6.sin6_addr,

			       &srx->transport.sin6.sin6_addr,

			       sizeof(struct in6_addr));

#endif

	default:

		BUG();

	}

net/rxrpc/output.c

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ int rxrpc_send_data_packet(struct rxrpc_connection *conn, struct sk_buff *skb) 
		}

		break;



#ifdef CONFIG_AF_RXRPC_IPV6

	case AF_INET6:

		opt = IPV6_PMTUDISC_DONT;

		ret = kernel_setsockopt(conn->params.local->socket,
@@ -274,6 +275,7 @@ int rxrpc_send_data_packet(struct rxrpc_connection *conn, struct sk_buff *skb) 
					  (char *)&opt, sizeof(opt));

		}

		break;

#endif

	}



	up_write(&conn->params.local->defrag_sem);