diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-25 12:38:20 +0200 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-25 12:38:20 +0200 |
commit | 10d15322ed26652263a579bcb59dfd49ab8a30de (patch) | |
tree | b1497de1b8ffd34b991cdf6e21de1c7a0a65f1de /include/net/af_unix.h | |
parent | 0316d30ea3e66379cd30ed70a114bc282159bb4c (diff) | |
parent | e5a9f8d04660da7ef3a98260aa74c3976f9cb4cd (diff) | |
download | linux-10d15322ed26652263a579bcb59dfd49ab8a30de.tar.gz linux-10d15322ed26652263a579bcb59dfd49ab8a30de.tar.xz |
Merge remote-tracking branch 'mac80211-next/master' into next
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 4a167b30a12f..cb1b9bbda332 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -63,7 +63,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 |