diff options
-rw-r--r-- | include/net/ip_vs.h | 1 | ||||
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 3759167f91f5..078887c8c586 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -889,6 +889,7 @@ struct netns_ipvs { | |||
889 | struct delayed_work defense_work; /* Work handler */ | 889 | struct delayed_work defense_work; /* Work handler */ |
890 | int drop_rate; | 890 | int drop_rate; |
891 | int drop_counter; | 891 | int drop_counter; |
892 | int old_secure_tcp; | ||
892 | atomic_t dropentry; | 893 | atomic_t dropentry; |
893 | /* locks in ctl.c */ | 894 | /* locks in ctl.c */ |
894 | spinlock_t dropentry_lock; /* drop entry handling */ | 895 | spinlock_t dropentry_lock; /* drop entry handling */ |
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index c8f81dd15c83..3cccc88ef817 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c | |||
@@ -93,7 +93,6 @@ static bool __ip_vs_addr_is_local_v6(struct net *net, | |||
93 | static void update_defense_level(struct netns_ipvs *ipvs) | 93 | static void update_defense_level(struct netns_ipvs *ipvs) |
94 | { | 94 | { |
95 | struct sysinfo i; | 95 | struct sysinfo i; |
96 | static int old_secure_tcp = 0; | ||
97 | int availmem; | 96 | int availmem; |
98 | int nomem; | 97 | int nomem; |
99 | int to_change = -1; | 98 | int to_change = -1; |
@@ -174,35 +173,35 @@ static void update_defense_level(struct netns_ipvs *ipvs) | |||
174 | spin_lock(&ipvs->securetcp_lock); | 173 | spin_lock(&ipvs->securetcp_lock); |
175 | switch (ipvs->sysctl_secure_tcp) { | 174 | switch (ipvs->sysctl_secure_tcp) { |
176 | case 0: | 175 | case 0: |
177 | if (old_secure_tcp >= 2) | 176 | if (ipvs->old_secure_tcp >= 2) |
178 | to_change = 0; | 177 | to_change = 0; |
179 | break; | 178 | break; |
180 | case 1: | 179 | case 1: |
181 | if (nomem) { | 180 | if (nomem) { |
182 | if (old_secure_tcp < 2) | 181 | if (ipvs->old_secure_tcp < 2) |
183 | to_change = 1; | 182 | to_change = 1; |
184 | ipvs->sysctl_secure_tcp = 2; | 183 | ipvs->sysctl_secure_tcp = 2; |
185 | } else { | 184 | } else { |
186 | if (old_secure_tcp >= 2) | 185 | if (ipvs->old_secure_tcp >= 2) |
187 | to_change = 0; | 186 | to_change = 0; |
188 | } | 187 | } |
189 | break; | 188 | break; |
190 | case 2: | 189 | case 2: |
191 | if (nomem) { | 190 | if (nomem) { |
192 | if (old_secure_tcp < 2) | 191 | if (ipvs->old_secure_tcp < 2) |
193 | to_change = 1; | 192 | to_change = 1; |
194 | } else { | 193 | } else { |
195 | if (old_secure_tcp >= 2) | 194 | if (ipvs->old_secure_tcp >= 2) |
196 | to_change = 0; | 195 | to_change = 0; |
197 | ipvs->sysctl_secure_tcp = 1; | 196 | ipvs->sysctl_secure_tcp = 1; |
198 | } | 197 | } |
199 | break; | 198 | break; |
200 | case 3: | 199 | case 3: |
201 | if (old_secure_tcp < 2) | 200 | if (ipvs->old_secure_tcp < 2) |
202 | to_change = 1; | 201 | to_change = 1; |
203 | break; | 202 | break; |
204 | } | 203 | } |
205 | old_secure_tcp = ipvs->sysctl_secure_tcp; | 204 | ipvs->old_secure_tcp = ipvs->sysctl_secure_tcp; |
206 | if (to_change >= 0) | 205 | if (to_change >= 0) |
207 | ip_vs_protocol_timeout_change(ipvs, | 206 | ip_vs_protocol_timeout_change(ipvs, |
208 | ipvs->sysctl_secure_tcp > 1); | 207 | ipvs->sysctl_secure_tcp > 1); |