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 <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
FUJITA Tomonori 2013-05-28 14:29:28 +09:00
parent b35444955d
commit ce6abfa776

View File

@ -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):