Merge citrix branch into master.

2025-08-31 06:15:47 +00:00 · 2009-09-02 10:14:53 -07:00
parent 2c7807ac4f 0ad9b73291
commit f1acd62b54
19 changed files with 910 additions and 315 deletions
--- 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. */
 };