Skip to content

Commit 36cfc39

Browse files
committed
properly disable the feature on iouring/linux_xdp
1 parent 374716c commit 36cfc39

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,10 @@ if (QUIC_USE_SYSTEM_LIBCRYPTO)
775775
list(APPEND QUIC_COMMON_DEFINES CXPLAT_SYSTEM_CRYPTO)
776776
endif()
777777

778+
if (QUIC_LINUX_XDP_ENABLED)
779+
list(APPEND QUIC_COMMON_DEFINES CXPLAT_LINUX_XDP_ENABLED)
780+
endif()
781+
778782
if (QUIC_LINUX_IOURING_ENABLED)
779783
list(APPEND QUIC_COMMON_DEFINES CXPLAT_USE_IO_URING)
780784
endif()

src/core/listener.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ QuicListenerParamSet(
910910
!Listener->Stopped) {
911911
return QUIC_STATUS_INVALID_PARAMETER;
912912
}
913-
#if defined(__linux__) && !defined(QUIC_LINUX_IOURING_ENABLED) && !defined(QUIC_LINUX_XDP_ENABLED)
913+
#if defined(__linux__) && !defined(CXPLAT_USE_IO_URING) && !defined(CXPLAT_LINUX_XDP_ENABLED)
914914
Listener->PartitionIndex = PartitionIndex;
915915
Listener->Partitioned = TRUE;
916916
QuicWorkerAssignListener(

src/test/lib/ApiTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6819,7 +6819,7 @@ QuicTestValidateExecutionContext()
68196819
void QuicTestValidateExecutionContext() {}
68206820
#endif // QUIC_API_EXECUTION_CONTEXT
68216821

6822-
#if defined(__linux__) && !defined(QUIC_LINUX_IOURING_ENABLED) && !defined(QUIC_LINUX_XDP_ENABLED)
6822+
#if defined(__linux__) && !defined(CXPLAT_USE_IO_URING) && !defined(CXPLAT_LINUX_XDP_ENABLED)
68236823

68246824
uint32_t
68256825
TestCurThreadID()
@@ -7098,9 +7098,9 @@ QuicTestValidatePartition()
70987098
QuicTestValidatePartition(CxPlatProcCount());
70997099
}
71007100

7101-
#else // defined(__linux__) && !defined(QUIC_LINUX_IOURING_ENABLED) && !defined(QUIC_LINUX_XDP_ENABLED)
7101+
#else // defined(__linux__) && !defined(QUIC_LINUX_IOURING_ENABLED) && !defined(CXPLAT_LINUX_XDP_ENABLED)
71027102
void QuicTestValidatePartition() {}
7103-
#endif // defined(__linux__) && !defined(QUIC_LINUX_IOURING_ENABLED) && !defined(QUIC_LINUX_XDP_ENABLED)
7103+
#endif // defined(__linux__) && !defined(QUIC_LINUX_IOURING_ENABLED) && !defined(CXPLAT_LINUX_XDP_ENABLED)
71047104

71057105
#endif // QUIC_API_ENABLE_PREVIEW_FEATURES
71067106

0 commit comments

Comments
 (0)