On Wed, Jun 27, 2012 at 03:21:36PM +1200, Joe Stringer wrote:
> On 27 June 2012 01:09, Joe Stringer <[email protected]> wrote:
> > Signed-off-by: Joe Stringer <[email protected]>
> > ---
> > v3: Add test to see that metadata gets encoded in NXAST packet_in messages.
[...]
> I've just checked this against Ben's newer OXM field names patch, just
> need to change the 0,NULL below NXM_NX_TUN_ID and above
> OXM_OF_METADATA to fix:
> http://openvswitch.org/pipermail/dev/2012-June/018354.html
I looked this over, applied the following minor changes, and pushed it
to master. Thank you!
diff --git a/NEWS b/NEWS
index d3cfe13..c2ec953 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ post-v1.7.0
- Allow support for arbitrary Ethernet masks. (Previously, only
the multicast bit in the destination address could be individually
masked.)
+ - New field OXM_OF_METADATA, to align with OpenFlow 1.1.
- Additional protocols are not mirrored and dropped when forward-bpdu is
false. For a full list, see the ovs-vswitchd.conf.db man page.
- Open vSwitch now sends RARP packets in situations where it previously
diff --git a/lib/nx-match.h b/lib/nx-match.h
index b8d194b..c814275 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -92,7 +92,7 @@ void nxm_decode_discrete(struct mf_subfield *, ovs_be32
header,
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 12);
/* Upper bound on the length of an nx_match. The longest nx_match (an
- * IPV6 neighbor discovery message using 5 registers) would be:
+ * IPV6 neighbor discovery message using all the registers) would be:
*
* header value mask total
* ------ ----- ---- -----
@@ -122,8 +122,9 @@ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 12);
* NXM_NX_REG_W(6) 4 4 4 12
* NXM_NX_REG_W(7) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
+ * OXM_OF_METADATA 4 8 8 20
* -------------------------------------------
- * total 333
+ * total 353
*
* So this value is conservative.
*/
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
