From ce6abfa776f1f45120d664c6c9193177aeda00ba Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 28 May 2013 14:29:28 +0900 Subject: [PATCH] Revert "of1.2: Fix MTVlanVid() parser and serializer" This reverts commit 6afa1c35ec0a0b2c66c22b6521be9886397aa1df. You need this change when you use osrg's mpls-of12 repository: https://github.com/osrg/openvswitch/tree/mpls-of12 Signed-off-by: FUJITA Tomonori --- ryu/ofproto/ofproto_v1_2_parser.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index 61618a88..e95c2b35 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -2104,16 +2104,6 @@ class MTVlanVid(OFPMatchField): self.value = value self.mask = mask - @classmethod - def field_parser(cls, header, buf, offset): - m = super(MTVlanVid, cls).field_parser(header, buf, offset) - m.value &= ~ofproto_v1_2.OFPVID_PRESENT - return m - - def serialize(self, buf, offset): - self.value |= ofproto_v1_2.OFPVID_PRESENT - super(MTVlanVid, self).serialize(buf, offset) - @OFPMatchField.register_field_header([ofproto_v1_2.OXM_OF_VLAN_PCP]) class MTVlanPcp(OFPMatchField):