commit 355c2d4679e81c1e1c2ae12e03b6a2ced5ebb7d0 Author: Jamal Hadi Salim Date: Wed Oct 16 10:30:01 2013 -0400 [Iproute: bridge] Remove redundant check Signed-off-by: Jamal Hadi Salim diff --git a/bridge/link.c b/bridge/link.c index 38dfaea..ab4a5d5 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -271,7 +271,7 @@ static int brlink_modify(int argc, char **argv) exit(-1); } else if (strcmp(*argv, "hairpin") == 0) { NEXT_ARG(); - if (!on_off("hairping", &hairpin, *argv)) + if (!on_off("hairpin", &hairpin, *argv)) exit(-1); } else if (strcmp(*argv, "fastleave") == 0) { NEXT_ARG(); @@ -357,9 +357,7 @@ static int brlink_modify(int argc, char **argv) nest = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC); addattr16(&req.n, sizeof(req), IFLA_BRIDGE_FLAGS, flags); - - if (mode >= 0) - addattr16(&req.n, sizeof(req), IFLA_BRIDGE_MODE, mode); + addattr16(&req.n, sizeof(req), IFLA_BRIDGE_MODE, mode); addattr_nest_end(&req.n, nest); }