diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-09-02 10:14:53 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-09-02 10:14:53 -0700 |
| commit | f1acd62b54376a425a975f9af501c4c8c5689b39 (patch) | |
| tree | a579f967870b61d3a226acdc62cc079c8ce996d1 /include | |
| parent | 2c7807ac4f578bfdd7a46b79028935c9aa34cde3 (diff) | |
| parent | 0ad9b732910b8f1aa7fc47ea57ff79e7618a4e6d (diff) | |
Merge citrix branch into master.
Diffstat (limited to 'include')
| -rw-r--r-- | include/openflow/openflow-mgmt.h | 3 | ||||
| -rw-r--r-- | include/openvswitch/datapath-protocol.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/openflow/openflow-mgmt.h b/include/openflow/openflow-mgmt.h index c3b62c91..04017d42 100644 --- a/include/openflow/openflow-mgmt.h +++ b/include/openflow/openflow-mgmt.h @@ -243,7 +243,8 @@ enum ofmp_extended_data_flags { /* Body of extended data message. May be sent by either the switch or the * controller to send messages that are greater than 65535 bytes in - * length. + * length. The OpenFlow transaction id (xid) must be the same for all + * the individual OpenFlow messages that make up an extended message. * * OFMPT_EXTENDED_DATA (switch <-> controller) */ struct ofmp_extended_data { diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 868c8542..04423d94 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -160,7 +160,8 @@ struct odp_flow_key { __be16 tp_dst; /* TCP/UDP destination port. */ __u8 dl_src[ETH_ALEN]; /* Ethernet source address. */ __u8 dl_dst[ETH_ALEN]; /* Ethernet destination address. */ - __u8 nw_proto; /* IP protocol. */ + __u8 nw_proto; /* IP protocol or lower 8 bits of + ARP opcode. */ __u8 reserved; /* Pad to 64 bits. */ }; |