Currently, the table id for VRF devices requires an integer. Convert
it to use rtnl_rttable_a2n which handles table names from the iproute2
directory.
This also fixes a bug in the original commit where table name are not
properly handled.
Fixes: 15faa0a30bed ("add support for VRF device")
Signed-off-by: David Ahern <d...@cumulusnetworks.com>
---
ip/iplink_vrf.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/ip/iplink_vrf.c b/ip/iplink_vrf.c
index 913a2892c95b..9b4b7728cf6f 100644
--- a/ip/iplink_vrf.c
+++ b/ip/iplink_vrf.c
@@ -28,12 +28,6 @@ static void explain(void)
vrf_explain(stderr);
}
-static int table_arg(void)
-{
- fprintf(stderr,"Error: argument of \"table\" must be 0-32767 and
currently unused\n");
- return -1;
-}
-
static int vrf_parse_opt(struct link_util *lu, int argc, char **argv,
struct nlmsghdr *n)
{
@@ -43,9 +37,8 @@ static int vrf_parse_opt(struct link_util *lu, int argc, char
**argv,
NEXT_ARG();
- table = atoi(*argv);
- if (table > 32767)
- return table_arg();
+ if (rtnl_rttable_a2n(&table, *argv))
+ invarg("invalid table ID\n", *argv);
addattr32(n, 1024, IFLA_VRF_TABLE, table);
} else if (matches(*argv, "help") == 0) {
explain();
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
