From 6d3b5206cfaf5a85c128b671b1d9527ed553c930 Mon Sep 17 00:00:00 2001 From: "RUANG (James Roy)" Date: Wed, 27 Nov 2024 14:53:41 +0800 Subject: gh-127072: Remove outdated `socket.NETLINK_*` constants. (GH-127256) Remove seriously outdated netlink constants. Co-authored-by: Gregory P. Smith --- .../2024-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 0000000..1bc7e1f --- /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 not present in Linux kernels beyond 2.6.17. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 06be822..9394f1c 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -7594,36 +7594,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 -- cgit v0.12