diff mbox series

[RFC,net-next,05/20] net/smc: try test to fallback when ulp set

Message ID 1708412505-34470-6-git-send-email-alibuda@linux.alibaba.com (mailing list archive)
State RFC
Delegated to: Netdev Maintainers
Headers show
Series Introduce IPPROTO_SMC | expand

Checks

Context Check Description
netdev/series_format fail Series longer than 15 patches (and no cover letter)
netdev/tree_selection success Clearly marked for net-next, async
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 940 this patch: 940
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 10 of 10 maintainers
netdev/build_clang success Errors and warnings before: 957 this patch: 957
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 957 this patch: 957
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 17 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

D. Wythe Feb. 20, 2024, 7:01 a.m. UTC 
From: "D. Wythe" <alibuda@linux.alibaba.com>

Currently, when the ULP option was seen, we will immediately
return a failure. Here we try to fallback first as much as possible,
rather than immediately returning.

Signed-off-by: D. Wythe <alibuda@linux.alibaba.com>
---
 net/smc/af_smc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 7966d06..b7c9f5c 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -3048,6 +3048,7 @@  static inline bool smc_is_unsupport_tcp_sockopt(int optname)
 	case TCP_FASTOPEN_CONNECT:
 	case TCP_FASTOPEN_KEY:
 	case TCP_FASTOPEN_NO_COOKIE:
+	case TCP_ULP:
 		return true;
 	}
 	return false;
@@ -3119,9 +3120,7 @@  static int smc_setsockopt(struct socket *sock, int level, int optname,
 	struct smc_sock *smc;
 	int rc;
 
-	if (level == SOL_TCP && optname == TCP_ULP)
-		return -EOPNOTSUPP;
-	else if (level == SOL_SMC)
+	if (level == SOL_SMC)
 		return __smc_setsockopt(sock, level, optname, optval, optlen);
 
 	smc = smc_sk(sk);