iplink: new option to set neigh suppression on a bridge port

neigh suppression can be used to suppress arp and nd flood
to bridge ports. It maps to the recently added
kernel support for bridge port flag IFLA_BRPORT_NEIGH_SUPPRESS.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

diff --git a/bridge/link.c b/bridge/link.c
index 93472ad3699e39bb4175d96c74993981b7df7e6c..d3a211ef01dc66b9f00115cc4121ec4b601d3b24 100644 (file)
--- a/bridge/link.c
+++ b/bridge/link.c
@@ -198,6 +198,9 @@ int print_linkinfo(const struct sockaddr_nl *who,
                                if (prtb[IFLA_BRPORT_MCAST_FLOOD])
                                        print_onoff(fp, "mcast_flood",
                                                    rta_getattr_u8(prtb[IFLA_BRPORT_MCAST_FLOOD]));
+                               if (prtb[IFLA_BRPORT_NEIGH_SUPPRESS])
+                                       print_onoff(fp, "neigh_suppress",
+                                                   rta_getattr_u8(prtb[IFLA_BRPORT_NEIGH_SUPPRESS]));
                        }
                } else
                        print_portstate(fp, rta_getattr_u8(tb[IFLA_PROTINFO]));
@@ -266,6 +269,7 @@ static int brlink_modify(int argc, char **argv)
                .ifm.ifi_family = PF_BRIDGE,
        };
        char *d = NULL;
+       __s8 neigh_suppress = -1;
        __s8 learning = -1;
        __s8 learning_sync = -1;
        __s8 flood = -1;
@@ -355,6 +359,11 @@ static int brlink_modify(int argc, char **argv)
                        flags |= BRIDGE_FLAGS_SELF;
                } else if (strcmp(*argv, "master") == 0) {
                        flags |= BRIDGE_FLAGS_MASTER;
+               } else if (strcmp(*argv, "neigh_suppress") == 0) {
+                       NEXT_ARG();
+                       if (!on_off("neigh_suppress", &neigh_suppress,
+                                   *argv))
+                               return -1;
                } else {
                        usage();
                }
@@ -407,6 +416,10 @@ static int brlink_modify(int argc, char **argv)
        if (state >= 0)
                addattr8(&req.n, sizeof(req), IFLA_BRPORT_STATE, state);
 
+       if (neigh_suppress != -1)
+               addattr8(&req.n, sizeof(req), IFLA_BRPORT_NEIGH_SUPPRESS,
+                        neigh_suppress);
+
        addattr_nest_end(&req.n, nest);
 
        /* IFLA_AF_SPEC nested attribute. Contains IFLA_BRIDGE_FLAGS that

diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
index 80272b0941104dbfaca01e8a0457b60231d6de88..fdf8e89943e3c28daf7f5344fe5776a75ce02d3e 100644 (file)
--- a/ip/iplink_bridge_slave.c
+++ b/ip/iplink_bridge_slave.c
@@ -238,6 +238,10 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
        if (tb[IFLA_BRPORT_MCAST_FLOOD])
                _print_onoff(f, "mcast_flood", "mcast_flood",
                             rta_getattr_u8(tb[IFLA_BRPORT_MCAST_FLOOD]));
+
+       if (tb[IFLA_BRPORT_NEIGH_SUPPRESS])
+               _print_onoff(f, "neigh_suppress", "neigh_suppress",
+                            rta_getattr_u8(tb[IFLA_BRPORT_NEIGH_SUPPRESS]));
 }
 
 static void bridge_slave_parse_on_off(char *arg_name, char *arg_val,
@@ -328,6 +332,10 @@ static int bridge_slave_parse_opt(struct link_util *lu, int argc, char **argv,
                        NEXT_ARG();
                        bridge_slave_parse_on_off("mcast_fast_leave", *argv, n,
                                                  IFLA_BRPORT_FAST_LEAVE);
+               } else if (matches(*argv, "neigh_suppress") == 0) {
+                       NEXT_ARG();
+                       bridge_slave_parse_on_off("neigh_suppress", *argv, n,
+                                                 IFLA_BRPORT_NEIGH_SUPPRESS);
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 9c5f855df72e1e86188a46cedf9f8b0d7de953f1..fdba0fea239742c65bb998bbd23516dfcf6d78ce 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -322,6 +322,10 @@ switch.
 .BR "mcast_flood on " or " mcast_flood off "
 Controls whether a given port will be flooded with multicast traffic for which there is no MDB entry. By default this flag is on.
 
+.TP
+.BR "neigh_suppress on " or " neigh_suppress off "
+Controls whether neigh discovery (arp and nd) proxy and suppression is enabled on the port. By default this flag is off.
+
 .TP
 .BI self
 link setting is configured on specified physical device