diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-09-21 06:58:42 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-09-21 06:58:42 -0300 |
| commit | b1ca1718afa81dc5de21c0a989e9fd6f29dc4b83 (patch) | |
| tree | 02ed66df3ed6cf3bd61978d1737082a7e2d3845e /include/net | |
| parent | f7fec5c0f340890755352b1003e1d14ae8c4c21a (diff) | |
[SOCK] remove sk_pair, only really used by AF_UNIX
Added ->peer to struct unix_sock
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/af_unix.h | 7 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index be877d75cfeb..b60b3846b9d1 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -37,16 +37,14 @@ static inline struct sock *next_unix_socket(int *i, struct sock *s) #define forall_unix_sockets(i, s) \ for (s = first_unix_socket(&(i)); s; s = next_unix_socket(&(i),(s))) -struct unix_address -{ +struct unix_address { atomic_t refcnt; int len; unsigned hash; struct sockaddr_un name[0]; }; -struct unix_skb_parms -{ +struct unix_skb_parms { struct ucred creds; /* Skb credentials */ struct scm_fp_list *fp; /* Passed files */ }; @@ -68,6 +66,7 @@ struct unix_sock { struct dentry *dentry; struct vfsmount *mnt; struct semaphore readsem; + struct sock *peer; struct sock *other; struct sock *gc_tree; atomic_t inflight; diff --git a/include/net/sock.h b/include/net/sock.h index e47031cf0a51..0666e2edd3c7 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -142,7 +142,6 @@ struct sock_common { * @sk_route_caps - route capabilities (e.g. %NETIF_F_TSO) * @sk_lingertime - %SO_LINGER l_linger setting * @sk_hashent - hash entry in several tables (e.g. tcp_ehash) - * @sk_pair - socket pair (e.g. AF_UNIX/unix_peer) * @sk_backlog - always used with the per-socket spinlock held * @sk_callback_lock - used with the callbacks in the end of this struct * @sk_error_queue - rarely used @@ -219,7 +218,6 @@ struct sock { int sk_route_caps; unsigned long sk_lingertime; int sk_hashent; - struct sock *sk_pair; /* * The backlog queue is special, it is always used with * the per-socket spinlock held and requires low latency |