| commit | 1dcdc363b51be6f0c8e02648bf5dbbc0b2b2708c | [log] [tgz] |
|---|---|---|
| author | abat <abat@bigswitch.com> | Thu Jul 17 10:35:24 2014 -0700 |
| committer | abat <abat@bigswitch.com> | Thu Jul 17 10:35:24 2014 -0700 |
| tree | 73c6596081591eedb70d83bf1533b7dae4d427ec | |
| parent | 201b2d72df2f8d39d9e87bebdf5e348772e26716 [diff] | |
| parent | d4a6932cb2fd9c19254e4253d69fe55f3e68753a [diff] |
Merge into master from pull request #301: openflow_input: remove subtype from OF 1.0 and 1.1 experimenter message (https://github.com/floodlight/loxigen/pull/301)
diff --git a/openflow_input/standard-1.0 b/openflow_input/standard-1.0 index 1df03bb..1e4750b 100644 --- a/openflow_input/standard-1.0 +++ b/openflow_input/standard-1.0
@@ -341,7 +341,6 @@ uint16_t length; uint32_t xid; uint32_t experimenter == ?; - uint32_t subtype; of_octets_t data; };
diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1 index a9aac6b..6765fe7 100644 --- a/openflow_input/standard-1.1 +++ b/openflow_input/standard-1.1
@@ -447,7 +447,6 @@ uint16_t length; uint32_t xid; uint32_t experimenter == ?; - uint32_t subtype; of_octets_t data; };