diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 05:44:25 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 05:44:25 +0300 |
commit | 86cfccb66937dd6cbf26ed619958b9e587e6a115 (patch) | |
tree | 9ecaaf0a669141805dee0af6c7d33467d1ff58d2 /net | |
parent | 0e4656a299db8484933a143259e7e5ebae2e3a01 (diff) | |
parent | 055923bf6b48659755b5f0169e34107ee2cb9b68 (diff) | |
download | linux-86cfccb66937dd6cbf26ed619958b9e587e6a115.tar.xz |
Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland:
"This set includes a some improvements to the dlm networking layer:
improving the ability to trace dlm messages for debugging, and
improved handling of bad messages or disrupted connections"
* tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
fs: dlm: implement tcp graceful shutdown
fs: dlm: change handling of reconnects
fs: dlm: don't close socket on invalid message
fs: dlm: set skb mark per peer socket
fs: dlm: set skb mark for listen socket
net: sock: add sock_set_mark
dlm: Fix kobject memleak
Diffstat (limited to 'net')
-rw-r--r-- | net/core/sock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 49cd5ffe673e..d29709e0790d 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -820,6 +820,14 @@ void sock_set_rcvbuf(struct sock *sk, int val) } EXPORT_SYMBOL(sock_set_rcvbuf); +void sock_set_mark(struct sock *sk, u32 val) +{ + lock_sock(sk); + sk->sk_mark = val; + release_sock(sk); +} +EXPORT_SYMBOL(sock_set_mark); + /* * This is meant for all protocols to use and covers goings on * at the socket level. Everything here is generic. |