[PATCH mptcp-next 2/6] mptcp: sockopt: update supported list

Matthieu Baerts posted 6 patches 2 years, 7 months ago
Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <martineau@kernel.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
[PATCH mptcp-next 2/6] mptcp: sockopt: update supported list
Posted by Matthieu Baerts 2 years, 7 months ago
IP_TOS, IPV6_TRANSPARENT and IPV6_FREEBIND are fully supported but we
forgot to move them to the "should work fine" section.

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
 net/mptcp/sockopt.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index a46a00bf0f08..af1d30c8832d 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -437,6 +437,7 @@ static bool mptcp_supported_sockopt(int level, int optname)
 		/* should work fine */
 		case IP_FREEBIND:
 		case IP_TRANSPARENT:
+		case IP_TOS:
 
 		/* the following are control cmsg related */
 		case IP_PKTINFO:
@@ -450,7 +451,6 @@ static bool mptcp_supported_sockopt(int level, int optname)
 		case IP_RECVFRAGSIZE:
 
 		/* common stuff that need some love */
-		case IP_TOS:
 		case IP_TTL:
 		case IP_BIND_ADDRESS_NO_PORT:
 		case IP_MTU_DISCOVER:
@@ -479,7 +479,10 @@ static bool mptcp_supported_sockopt(int level, int optname)
 	}
 	if (level == SOL_IPV6) {
 		switch (optname) {
+		/* should work fine */
 		case IPV6_V6ONLY:
+		case IPV6_TRANSPARENT:
+		case IPV6_FREEBIND:
 
 		/* the following are control cmsg related */
 		case IPV6_RECVPKTINFO:
@@ -500,8 +503,6 @@ static bool mptcp_supported_sockopt(int level, int optname)
 
 		/* the following ones need some love but are quite common */
 		case IPV6_TCLASS:
-		case IPV6_TRANSPARENT:
-		case IPV6_FREEBIND:
 		case IPV6_PKTINFO:
 		case IPV6_2292PKTOPTIONS:
 		case IPV6_UNICAST_HOPS:

-- 
2.40.1