diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 19:44:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 19:44:25 -0700 |
| commit | 86cfccb66937dd6cbf26ed619958b9e587e6a115 (patch) | |
| tree | 9ecaaf0a669141805dee0af6c7d33467d1ff58d2 /include/net | |
| parent | 0e4656a299db8484933a143259e7e5ebae2e3a01 (diff) | |
| parent | 055923bf6b48659755b5f0169e34107ee2cb9b68 (diff) | |
| download | linux-86cfccb66937dd6cbf26ed619958b9e587e6a115.tar.bz2 | |
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 'include/net')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 497c64ff8bda..064637d1ddf6 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2696,6 +2696,7 @@ void sock_no_linger(struct sock *sk); void sock_set_keepalive(struct sock *sk); void sock_set_priority(struct sock *sk, u32 priority); void sock_set_rcvbuf(struct sock *sk, int val); +void sock_set_mark(struct sock *sk, u32 val); void sock_set_reuseaddr(struct sock *sk); void sock_set_reuseport(struct sock *sk); void sock_set_sndtimeo(struct sock *sk, s64 secs); |