| Message ID | 1443595493-17902-1-git-send-email-simon.horman@netronome.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Sep 30, 2015 at 03:44:53PM +0900, Simon Horman wrote: > Due to an error on my part the Netronome vendor Id is incorrect: > the last digit should be 'D' rather than '0' as per the > Netronome IEEE OUI. > > Signed-off-by: Simon Horman <simon.horman@netronome.com> > > --- > > * Compile tested only > * This problem is also present in the branch-2.4, > please consider applying it there too > > v2 > * Provide backwards compatibility via NTR_COMPAT_VENDOR_ID Thanks, applied to master and branch-2.4. I edited this slightly so that the "D"s were lowercase "d"s, which are easier to distinguish from 0.
diff --git a/Documentation/group-selection-method-property.txt b/Documentation/group-selection-method-property.txt index 36337c6b5aea..f9ebe4aa021f 100644 --- a/Documentation/group-selection-method-property.txt +++ b/Documentation/group-selection-method-property.txt @@ -47,7 +47,7 @@ allows controllers to: The Experimenter ID of this extension is: -NTR_VENDOR_ID = 0x00001540 +NTR_VENDOR_ID = 0x0000154D 4. Group Experimenter Property diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h index c0d22820acdb..54535dfe9b3f 100644 --- a/include/openflow/openflow-common.h +++ b/include/openflow/openflow-common.h @@ -103,7 +103,8 @@ enum ofp_version { */ #define OF_VENDOR_ID 0 #define HPL_VENDOR_ID 0x000004EA /* HP Labs. */ -#define NTR_VENDOR_ID 0x00001540 /* Netronome. */ +#define NTR_VENDOR_ID 0x0000154D /* Netronome. */ +#define NTR_COMPAT_VENDOR_ID 0x00001540 /* Incorrect value used in v2.4. */ #define NX_VENDOR_ID 0x00002320 /* Nicira. */ #define ONF_VENDOR_ID 0x4f4e4600 /* Open Networking Foundation. */ diff --git a/lib/ofp-util.c b/lib/ofp-util.c index d90cca894bef..b9dbcdaeec5a 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -8191,6 +8191,7 @@ parse_ofp15_group_prop_exp(struct ofpbuf *payload, switch (experimenter) { case NTR_VENDOR_ID: + case NTR_COMPAT_VENDOR_ID: error = parse_group_prop_ntr(payload, exp_type, group_type, group_cmd, gp); break;
Due to an error on my part the Netronome vendor Id is incorrect: the last digit should be 'D' rather than '0' as per the Netronome IEEE OUI. Signed-off-by: Simon Horman <simon.horman@netronome.com> --- * Compile tested only * This problem is also present in the branch-2.4, please consider applying it there too v2 * Provide backwards compatibility via NTR_COMPAT_VENDOR_ID --- Documentation/group-selection-method-property.txt | 2 +- include/openflow/openflow-common.h | 3 ++- lib/ofp-util.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)