diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:05:31 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:05:31 -0800 |
| commit | 83ec293e0817e2536097dd86f7aba9c1c39ef1d2 (patch) | |
| tree | 63a5107d55cd7521b07473af5d138145254997b7 /include/net/af_unix.h | |
| parent | 42ed9e9dbae89671344a227469c9ee7f367c1ff9 (diff) | |
| parent | 1ea3a378f2cc7c3b3b4f3285921445506d92c429 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index a175ba4a7adb..dfe4ddfbb43c 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -64,7 +64,11 @@ struct unix_sock { #define UNIX_GC_MAYBE_CYCLE 1 struct socket_wq peer_wq; }; -#define unix_sk(__sk) ((struct unix_sock *)__sk) + +static inline struct unix_sock *unix_sk(struct sock *sk) +{ + return (struct unix_sock *)sk; +} #define peer_wait peer_wq.wait |