summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNavdeep Parhar <np@FreeBSD.org>2013-02-28 00:44:54 +0000
committerNavdeep Parhar <np@FreeBSD.org>2013-02-28 00:44:54 +0000
commitab02b6706c8cd58bd325f2246e8c5aee1a85c477 (patch)
tree3bdfee271df0550de50ee38deb9634e73dd77a5a /tools
parent26a50991923daf34f8d388e71aefacf5ce2b15a7 (diff)
Notes
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/cxgbetool/cxgbetool.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/tools/cxgbetool/cxgbetool.c b/tools/tools/cxgbetool/cxgbetool.c
index 7d0faa66c77a..39e737604dd7 100644
--- a/tools/tools/cxgbetool/cxgbetool.c
+++ b/tools/tools/cxgbetool/cxgbetool.c
@@ -955,7 +955,7 @@ set_filter(uint32_t idx, int argc, const char *argv[])
t.fs.mask.vnic = mask;
t.fs.val.vnic_vld = 1;
t.fs.mask.vnic_vld = 1;
- } else if (!parse_val_mask("vlan", args, &val, &mask)) {
+ } else if (!parse_val_mask("ivlan", args, &val, &mask)) {
t.fs.val.vlan = val;
t.fs.mask.vlan = mask;
t.fs.val.vlan_vld = 1;
@@ -1047,10 +1047,17 @@ set_filter(uint32_t idx, int argc, const char *argv[])
t.fs.newvlan = VLAN_REWRITE;
} else if (argv[start_arg + 1][0] == '+') {
t.fs.newvlan = VLAN_INSERT;
+ } else if (isdigit(argv[start_arg + 1][0]) &&
+ !parse_val_mask("vlan", args, &val, &mask)) {
+ t.fs.val.vlan = val;
+ t.fs.mask.vlan = mask;
+ t.fs.val.vlan_vld = 1;
+ t.fs.mask.vlan_vld = 1;
} else {
warnx("unknown vlan parameter \"%s\"; must"
- " be one of \"none\", \"=<vlan>\" or"
- " \"+<vlan>\"", argv[start_arg + 1]);
+ " be one of \"none\", \"=<vlan>\", "
+ " \"+<vlan>\", or \"<vlan>\"",
+ argv[start_arg + 1]);
return (EINVAL);
}
if (t.fs.newvlan == VLAN_REWRITE ||