projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Use 64-bit datapath id and management id (OpenFlow 0.9)
[openvswitch]
/
utilities
/
ovs-openflowd.c
diff --git
a/utilities/ovs-openflowd.c
b/utilities/ovs-openflowd.c
index 983481af0042af8b56e913eb16ae8c2e34a2fe90..1b8e7ebdffcfb37fffcb412b36fc2e3ec9d12f67 100644
(file)
--- a/
utilities/ovs-openflowd.c
+++ b/
utilities/ovs-openflowd.c
@@
-333,7
+333,7
@@
parse_options(int argc, char *argv[], struct ofsettings *s)
case OPT_DATAPATH_ID:
if (!dpid_from_string(optarg, &s->datapath_id)) {
ovs_fatal(0, "argument to --datapath-id must be "
case OPT_DATAPATH_ID:
if (!dpid_from_string(optarg, &s->datapath_id)) {
ovs_fatal(0, "argument to --datapath-id must be "
- "exactly 1
2
hex digits and may not be all-zero");
+ "exactly 1
6
hex digits and may not be all-zero");
}
break;
}
break;
@@
-521,7
+521,7
@@
usage(void)
vconn_usage(true, true, true);
printf("\nOpenFlow options:\n"
" -d, --datapath-id=ID Use ID as the OpenFlow switch ID\n"
vconn_usage(true, true, true);
printf("\nOpenFlow options:\n"
" -d, --datapath-id=ID Use ID as the OpenFlow switch ID\n"
- " (ID must consist of 1
2
hex digits)\n"
+ " (ID must consist of 1
6
hex digits)\n"
" --manufacturer=MFR Identify manufacturer as MFR\n"
" --hardware=HW Identify hardware as HW\n"
" --software=SW Identify software as SW\n"
" --manufacturer=MFR Identify manufacturer as MFR\n"
" --hardware=HW Identify hardware as HW\n"
" --software=SW Identify software as SW\n"