[v2,01/15] net/ipv4: add new sysctls

Submitted by Pavel Tikhomirov on April 20, 2016, 2:42 p.m.

Details

Message ID 1461163376-32668-2-git-send-email-ptikhomirov@virtuozzo.com
State Accepted
Series "net/ipv6: c/r dev/default/all conf ops"
Commit e7cd17c7e2f21f7f34fb7ae11a122b1541a0f19e
Headers show

Commit Message

Pavel Tikhomirov April 20, 2016, 2:42 p.m.
drop_unicast_in_l2_multicast and drop_gratuitous_arp appeared in MS:

commit 12b74dfadb5a ("ipv4: add option to drop unicast encapsulated in
L2 multicast")
commit 97daf3314550 ("ipv4: add option to drop gratuitous ARP packets")

https://jira.sw.ru/browse/PSBM-30942
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c                   | 2 ++
 test/zdtm/static/netns-dev.c | 4 ++++
 2 files changed, 6 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/net.c b/criu/net.c
index 6a1c404..51f9ff3 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -90,6 +90,8 @@  static char *devconfs[] = {
 	"src_valid_mark",
 	"tag",
 	"ignore_routes_with_linkdown",
+	"drop_gratuitous_arp",
+	"drop_unicast_in_l2_multicast",
 };
 
 /*
diff --git a/test/zdtm/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index fa623aa..9d1d5b7 100644
--- a/test/zdtm/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
@@ -19,6 +19,8 @@  char *devconfs[] = {
 	"bootp_relay",
 	"disable_policy",
 	"disable_xfrm",
+	"drop_gratuitous_arp",
+	"drop_unicast_in_l2_multicast",
 	"force_igmp_version",
 	"forwarding",
 	"igmpv2_unsolicited_report_interval",
@@ -52,6 +54,8 @@  int rand_limit[] = {
 	2,	/* bootp_relay */
 	2,	/* disable_policy */
 	2,	/* disable_xfrm */
+	2,	/* drop_gratuitous_arp */
+	2,	/* drop_unicast_in_l2_multicast */
 	0,	/* force_igmp_version */
 	2,	/* forwarding */
 	0,	/* igmpv2_unsolicited_report_interval */

Comments

Pavel Emelianov April 21, 2016, 2:11 p.m.
Applied