diff options
author | Hans Schillstrom <hans.schillstrom@ericsson.com> | 2011-01-03 14:45:00 +0100 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-01-13 10:30:28 +0900 |
commit | f2431e6e9255461eb1476340a89ad32ad4b38b03 (patch) | |
tree | 934974c80d2c01b44768369ca9b188f64c6ab979 /include/net/netns | |
parent | f6340ee0c6b9498ec918a7bb2f44e20abb8b2833 (diff) | |
download | op-kernel-dev-f2431e6e9255461eb1476340a89ad32ad4b38b03.zip op-kernel-dev-f2431e6e9255461eb1476340a89ad32ad4b38b03.tar.gz |
IPVS: netns, trash handling
trash list per namspace,
and reordering of some params in dst struct.
[ horms@verge.net.au: Use cancel_delayed_work_sync() instead of
cancel_rearming_delayed_work(). Found during
merge conflict resoliution ]
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/net/netns')
-rw-r--r-- | include/net/netns/ip_vs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/netns/ip_vs.h b/include/net/netns/ip_vs.h index 41332619..67ca1cf5 100644 --- a/include/net/netns/ip_vs.h +++ b/include/net/netns/ip_vs.h @@ -82,6 +82,9 @@ struct netns_ipvs { rwlock_t rs_lock; /* real services table */ /* semaphore for IPVS sockopts. And, [gs]etsockopt may sleep. */ struct lock_class_key ctl_key; /* ctl_mutex debuging */ + /* Trash for destinations */ + struct list_head dest_trash; + /* sys-ctl struct */ struct ctl_table_header *sysctl_hdr; struct ctl_table *sysctl_tbl; |