From a4b94d81060a55c0c4e6df073256ad2c93cf316b Mon Sep 17 00:00:00 2001 From: RUANG Date: Mon, 25 Nov 2024 19:11:41 +0800 Subject: [PATCH 1/2] Remove outdated netlink constants. --- ...-11-25-19-04-10.gh-issue-127072.-c284K.rst | 1 + Modules/socketmodule.c | 20 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst diff --git a/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst b/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst new file mode 100644 index 00000000000000..84ebfa4b13ca99 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst @@ -0,0 +1 @@ +Remove outdated ``socket.NETLINK_*`` constants. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 2764bd6e2b2a47..52f04f0f9bd245 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -7591,36 +7591,20 @@ socket_exec(PyObject *m) /* */ ADD_INT_MACRO(m, AF_NETLINK); ADD_INT_MACRO(m, NETLINK_ROUTE); -#ifdef NETLINK_SKIP - ADD_INT_MACRO(m, NETLINK_SKIP); -#endif -#ifdef NETLINK_W1 - ADD_INT_MACRO(m, NETLINK_W1); -#endif ADD_INT_MACRO(m, NETLINK_USERSOCK); ADD_INT_MACRO(m, NETLINK_FIREWALL); -#ifdef NETLINK_TCPDIAG - ADD_INT_MACRO(m, NETLINK_TCPDIAG); -#endif #ifdef NETLINK_NFLOG ADD_INT_MACRO(m, NETLINK_NFLOG); #endif #ifdef NETLINK_XFRM ADD_INT_MACRO(m, NETLINK_XFRM); #endif -#ifdef NETLINK_ARPD - ADD_INT_MACRO(m, NETLINK_ARPD); -#endif -#ifdef NETLINK_ROUTE6 - ADD_INT_MACRO(m, NETLINK_ROUTE6); -#endif +#ifdef NETLINK_IP6_FW ADD_INT_MACRO(m, NETLINK_IP6_FW); +#endif #ifdef NETLINK_DNRTMSG ADD_INT_MACRO(m, NETLINK_DNRTMSG); #endif -#ifdef NETLINK_TAPBASE - ADD_INT_MACRO(m, NETLINK_TAPBASE); -#endif #ifdef NETLINK_CRYPTO ADD_INT_MACRO(m, NETLINK_CRYPTO); #endif From a99fec7cced19ab7421c4f82a584e0f6158cafce Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Tue, 26 Nov 2024 22:29:37 -0800 Subject: [PATCH 2/2] clarify how outdated in the news entry. --- .../next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst b/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst index 84ebfa4b13ca99..1bc7e1f0de9e0b 100644 --- a/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst +++ b/Misc/NEWS.d/next/Library/2024-11-25-19-04-10.gh-issue-127072.-c284K.rst @@ -1 +1 @@ -Remove outdated ``socket.NETLINK_*`` constants. +Remove outdated ``socket.NETLINK_*`` constants not present in Linux kernels beyond 2.6.17.