diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 13:15:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 13:47:38 -0800 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /include/net/af_unix.h | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
| download | linux-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 90c9e2872f27..18e5c3f67580 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -10,6 +10,7 @@ extern void unix_inflight(struct file *fp); extern void unix_notinflight(struct file *fp); extern void unix_gc(void); extern void wait_for_unix_gc(void); +extern struct sock *unix_get_socket(struct file *filp); #define UNIX_HASH_SIZE 256 @@ -56,6 +57,7 @@ struct unix_sock { spinlock_t lock; unsigned int gc_candidate : 1; unsigned int gc_maybe_cycle : 1; + unsigned char recursion_level; struct socket_wq peer_wq; }; #define unix_sk(__sk) ((struct unix_sock *)__sk) |