summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
Diffstat (limited to 'Doc')
-rwxr-xr-xDoc/library/socket.rst11
-rw-r--r--Doc/whatsnew/3.9.rst7
2 files changed, 18 insertions, 0 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 5426b5a..87dee1a 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -408,6 +408,17 @@ Constants
.. versionadded:: 3.5
+.. data:: CAN_RAW_JOIN_FILTERS
+
+ Joins the applied CAN filters such that only CAN frames that match all
+ given CAN filters are passed to user space.
+
+ This constant is documented in the Linux documentation.
+
+ .. availability:: Linux >= 4.1.
+
+ .. versionadded:: 3.9
+
.. data:: CAN_ISOTP
CAN_ISOTP, in the CAN protocol family, is the ISO-TP (ISO 15765-2) protocol.
diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
index ef499f5..e49d426 100644
--- a/Doc/whatsnew/3.9.rst
+++ b/Doc/whatsnew/3.9.rst
@@ -362,6 +362,13 @@ a non-blocking socket. (Contributed by Dong-hee Na in :issue:`39259`.)
:class:`~smtplib.LMTP` constructor now has an optional *timeout* parameter.
(Contributed by Dong-hee Na in :issue:`39329`.)
+socket
+------
+
+The :mod:`socket` module now exports the :data:`~socket.CAN_RAW_JOIN_FILTERS`
+constant on Linux 4.1 and greater.
+(Contributed by Stefan Tatschner and Zackery Spytz in :issue:`25780`.)
+
threading
---------