g/c unused OF1.2/1.3 OFP_PACKET_IN_DATA_OFFSET definitions. they seem to be copy-and-paste leftover from OF1.0.
Signed-off-by: YAMAMOTO Takashi <[email protected]> --- ryu/ofproto/ofproto_v1_2.py | 1 - ryu/ofproto/ofproto_v1_3.py | 1 - ryu/tests/unit/ofproto/test_ofproto_v12.py | 1 - 3 files changed, 3 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_2.py b/ryu/ofproto/ofproto_v1_2.py index 16cf205..104c585 100644 --- a/ryu/ofproto/ofproto_v1_2.py +++ b/ryu/ofproto/ofproto_v1_2.py @@ -545,7 +545,6 @@ OFPCR_ROLE_SLAVE = 3 # Read-only access. # struct ofp_packet_in OFP_PACKET_IN_PACK_STR = '!IHBB' # the last 2x is for ofp_packet_in::data OFP_PACKET_IN_SIZE = 24 -OFP_PACKET_IN_DATA_OFFSET = 18 assert (calcsize(OFP_PACKET_IN_PACK_STR) + OFP_MATCH_SIZE + OFP_HEADER_SIZE == OFP_PACKET_IN_SIZE) diff --git a/ryu/ofproto/ofproto_v1_3.py b/ryu/ofproto/ofproto_v1_3.py index bba98ba..c476c0a 100644 --- a/ryu/ofproto/ofproto_v1_3.py +++ b/ryu/ofproto/ofproto_v1_3.py @@ -733,7 +733,6 @@ assert (calcsize(OFP_ASYNC_CONFIG_PACK_STR) + OFP_HEADER_SIZE == # struct ofp_packet_in OFP_PACKET_IN_PACK_STR = '!IHBBQ' OFP_PACKET_IN_SIZE = 32 -OFP_PACKET_IN_DATA_OFFSET = 18 assert (calcsize(OFP_PACKET_IN_PACK_STR) + OFP_MATCH_SIZE + OFP_HEADER_SIZE == OFP_PACKET_IN_SIZE) diff --git a/ryu/tests/unit/ofproto/test_ofproto_v12.py b/ryu/tests/unit/ofproto/test_ofproto_v12.py index 245d4e7..1d7551f 100644 --- a/ryu/tests/unit/ofproto/test_ofproto_v12.py +++ b/ryu/tests/unit/ofproto/test_ofproto_v12.py @@ -475,7 +475,6 @@ class TestOfprot12(unittest.TestCase): def test_struct_ofp_packet_in(self): eq_(OFP_PACKET_IN_PACK_STR, '!IHBB') eq_(OFP_PACKET_IN_SIZE, 24) - eq_(OFP_PACKET_IN_DATA_OFFSET, 18) def test_enum_ofp_packet_in_reason(self): eq_(OFPR_NO_MATCH, 0) -- 1.8.3.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
