diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-08-05 17:01:36 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-08-06 09:08:59 +0900 |
| commit | 3b9283484863164e804adb9d5b9352f7f8f3b6d7 (patch) | |
| tree | 55c0daf2a6d3fa422bd9a26df0b9d2fad6d260ae | |
| parent | 0bec11600bfb82ae12bed83b7c0c5049cfd49c4e (diff) | |
of12: stop assuming OFPXMC_OPENFLOW_BASIC
fix a merge botch and sync with of1.3 version.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_2_parser.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index b4a306b2..a9bd0b12 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -1704,12 +1704,12 @@ class OFPMatch(StringifyMixin): assert len(value) == len(mask) pack_str = "!I%ds%ds" % (len(value), len(mask)) msg_pack_into(pack_str, buf, field_offset, - ofproto_v1_2.oxm_tlv_header_w(n, len(value)), + (n << 9) | (1 << 8) | (len(value) * 2), value, mask) else: pack_str = "!I%ds" % (len(value),) msg_pack_into(pack_str, buf, field_offset, - ofproto_v1_2.oxm_tlv_header(n, len(value)), + (n << 9) | (0 << 8) | len(value), value) field_offset += struct.calcsize(pack_str) |