diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-05-06 01:11:53 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-05-06 01:11:53 -0500 |
| commit | e8f84c44a0d78cb3413d69331bee6ce4d86b2e1d (patch) | |
| tree | 0eb14b7e337b7b8dbc1bd97e11a13e1abc114b9a /include/net | |
| parent | e365c882ed38dbbe1a6ff4ed72414835390368a6 (diff) | |
| parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) | |
Merge tag 'v3.10.37' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.37-finallinux-lng-v3.10.xlinux-lng
This is the 3.10.37 stable release
Conflicts:
scripts/package/builddeb
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index cec4c723db9a..8f32b779bc83 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1437,6 +1437,11 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) */ #define sock_owned_by_user(sk) ((sk)->sk_lock.owned) +static inline void sock_release_ownership(struct sock *sk) +{ + sk->sk_lock.owned = 0; +} + /* * Macro so as to not evaluate some arguments when * lockdep is not enabled. |