IPVS: netns, defense work timer.

This patch makes defense work timer per name-space,
A net ptr had to be added to the ipvs struct,
since it's needed by defense_work_handler.

[ 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>

1 files changed, 3 insertions, 0 deletions

diff --git a/include/net/netns/ip_vs.h b/include/net/netns/ip_vs.h
index c4b1abf258e4..41332619142c 100644
--- a/include/net/netns/ip_vs.h
+++ b/include/net/netns/ip_vs.h
@@ -71,6 +71,7 @@ struct netns_ipvs {
 
         int                     num_services;    /* no of virtual services */
         /* 1/rate drop and drop-entry variables */
+        struct delayed_work     defense_work;   /* Work handler */
         int                     drop_rate;
         int                     drop_counter;
         atomic_t                dropentry;
@@ -129,6 +130,8 @@ struct netns_ipvs {
         /* multicast interface name */
         char                    master_mcast_ifn[IP_VS_IFNAME_MAXLEN];
         char                    backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
+        /* net name space ptr */
+        struct net              *net;            /* Needed by timer routines */
 };
 
 #endif /* IP_VS_H_ */