openflow-common: Correct Netronome vendor ID.

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>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/Documentation/group-selection-method-property.txt b/Documentation/group-selection-method-property.txt
index 36337c6..5320f24 100644 (file)
--- 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 c0d2282..b2b2d46 100644 (file)
--- 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 d90cca8..b9dbcda 100644 (file)
--- 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;