diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-11 15:43:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-11 15:43:02 -0800 |
| commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
| tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /include/net/af_unix.h | |
| parent | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
| download | op-kernel-dev-7e452baf6b96b5aeba097afd91501d33d390cc97.zip op-kernel-dev-7e452baf6b96b5aeba097afd91501d33d390cc97.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 7dd29b7..c29ff1d 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -54,6 +54,7 @@ struct unix_sock { atomic_long_t inflight; spinlock_t lock; unsigned int gc_candidate : 1; + unsigned int gc_maybe_cycle : 1; wait_queue_head_t peer_wait; }; #define unix_sk(__sk) ((struct unix_sock *)__sk) |
