diff options
author | Eric Dumazet <edumazet@google.com> | 2015-11-29 20:03:10 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-01 15:45:05 -0500 |
commit | 9cd3e072b0be17446e37d7414eac8a3499e0601e (patch) | |
tree | 83c6aac4a5164b4854a5d5d5deba1a513eee7157 /include/linux/net.h | |
parent | 5738a09d58d5ad2871f1f9a42bf6a3aa9ece5b3c (diff) | |
download | linux-stable-9cd3e072b0be17446e37d7414eac8a3499e0601e.tar.gz linux-stable-9cd3e072b0be17446e37d7414eac8a3499e0601e.tar.bz2 linux-stable-9cd3e072b0be17446e37d7414eac8a3499e0601e.zip |
net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA
This patch is a cleanup to make following patch easier to
review.
Goal is to move SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA
from (struct socket)->flags to a (struct socket_wq)->flags
to benefit from RCU protection in sock_wake_async()
To ease backports, we rename both constants.
Two new helpers, sk_set_bit(int nr, struct sock *sk)
and sk_clear_bit(int net, struct sock *sk) are added so that
following patch can change their implementation.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/net.h')
-rw-r--r-- | include/linux/net.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 70ac5e28e6b7..f514e4dd5521 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -34,8 +34,8 @@ struct inode; struct file; struct net; -#define SOCK_ASYNC_NOSPACE 0 -#define SOCK_ASYNC_WAITDATA 1 +#define SOCKWQ_ASYNC_NOSPACE 0 +#define SOCKWQ_ASYNC_WAITDATA 1 #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 @@ -96,7 +96,7 @@ struct socket_wq { * struct socket - general BSD socket * @state: socket state (%SS_CONNECTED, etc) * @type: socket type (%SOCK_STREAM, etc) - * @flags: socket flags (%SOCK_ASYNC_NOSPACE, etc) + * @flags: socket flags (%SOCK_NOSPACE, etc) * @ops: protocol specific socket operations * @file: File back pointer for gc * @sk: internal networking protocol agnostic socket representation |