summaryrefslogtreecommitdiff
path: root/Documentation/networking
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2023-01-13 05:56:47 +0300
committerJakub Kicinski <kuba@kernel.org>2023-01-13 06:59:56 +0300
commita99da46ac01a12e582684771b486c9292326d7a4 (patch)
tree498c7833f9efc9a35c99fa281ada1527c4b01f97 /Documentation/networking
parent55b98837e37da723c8b73ec0b48fe68c682b57d7 (diff)
parentd9fc1511728c15df49ff18e49a494d00f78b7cd4 (diff)
downloadlinux-a99da46ac01a12e582684771b486c9292326d7a4.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/usb/r8152.c be53771c87f4 ("r8152: add vendor/device ID pair for Microsoft Devkit") ec51fbd1b8a2 ("r8152: add USB device driver for config selection") https://lore.kernel.org/all/20230113113339.658c4723@canb.auug.org.au/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/rxrpc.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/rxrpc.rst b/Documentation/networking/rxrpc.rst
index 39494a6ea739..e1af54424192 100644
--- a/Documentation/networking/rxrpc.rst
+++ b/Documentation/networking/rxrpc.rst
@@ -880,8 +880,8 @@ The kernel interface functions are as follows:
notify_end_rx can be NULL or it can be used to specify a function to be
called when the call changes state to end the Tx phase. This function is
- called with the call-state spinlock held to prevent any reply or final ACK
- from being delivered first.
+ called with a spinlock held to prevent the last DATA packet from being
+ transmitted until the function returns.
(#) Receive data from a call::