Commit f2247fbd authored by Simon Horman's avatar Simon Horman
Browse files

IPVS: Conditionally include sysctl members of struct netns_ipvs 



There is now no need to include sysctl members of struct netns_ipvs
unless CONFIG_SYSCTL is defined.

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 14e40546

include/net/ip_vs.h

+13 −8
Original line number Diff line number Diff line
@@ -839,6 +839,17 @@ struct netns_ipvs { 
	struct ip_vs_stats		tot_stats;  /* Statistics & est. */



	int			num_services;    /* no of virtual services */



	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;

	/* Service counters */

	atomic_t		ftpsvc_counter;

	atomic_t		nullsvc_counter;



#ifdef CONFIG_SYSCTL

	/* 1/rate drop and drop-entry variables */

	struct delayed_work	defense_work;   /* Work handler */

	int			drop_rate;
@@ -848,18 +859,12 @@ struct netns_ipvs { 
	spinlock_t		dropentry_lock;  /* drop entry handling */

	spinlock_t		droppacket_lock; /* drop packet handling */

	spinlock_t		securetcp_lock;  /* state and timeout tables */

	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;

	/* Service counters */

	atomic_t		ftpsvc_counter;

	atomic_t		nullsvc_counter;



	/* sys-ctl struct */

	struct ctl_table_header	*sysctl_hdr;

	struct ctl_table	*sysctl_tbl;

#endif



	/* sysctl variables */

	int			sysctl_amemthresh;

	int			sysctl_am_droprate;