Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index b9af272..5c23279 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 #include <linux/rcupdate.h>
 #include <linux/if_ether.h>
+#include <linux/in6.h>
 #include <linux/jiffies.h>
 #include <linux/time.h>
 
@@ -31,8 +32,17 @@ struct sw_flow_actions {
 
 struct sw_flow_key {
        __be64  tun_id;     /* Encapsulating tunnel ID. */
-       __be32  nw_src;     /* IP source address. */
-       __be32  nw_dst;     /* IP destination address. */
+       union {
+               struct {
+                       __be32  ipv4_src;        /* IPv4 source address. */
+                       __be32  ipv4_dst;        /* IPv4 destination address. */
+               };
+               struct {
+                       struct in6_addr ipv6_src; /* IPv6 source address. */
+                       struct in6_addr ipv6_dst; /* IPv6 source address. */
+               };
+       };
+       struct in6_addr nd_target; /* IPv6 ND target address. */
        u16     in_port;    /* Input switch port. */
        __be16  dl_tci;     /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
        __be16  dl_type;    /* Ethernet frame type. */
@@ -42,8 +52,8 @@ struct sw_flow_key {
        u8      dl_dst[ETH_ALEN]; /* Ethernet destination address. */
        u8      nw_proto;   /* IP protocol or lower 8 bits of ARP opcode. */
        u8      nw_tos;     /* IP ToS (DSCP field, 6 bits). */
-       u8      arp_sha[ETH_ALEN]; /* ARP source hardware address. */
-       u8      arp_tha[ETH_ALEN]; /* ARP target hardware address. */
+       u8      arp_sha[ETH_ALEN]; /* ARP/ND source hardware address. */
+       u8      arp_tha[ETH_ALEN]; /* ARP/ND target hardware address. */
 };
 
 struct sw_flow {
@@ -98,10 +108,23 @@ u64 flow_used_time(unsigned long flow_jiffies);
 u32 flow_hash(const struct sw_flow_key *);
 int flow_cmp(const struct tbl_node *, void *target);
 
-/* By my calculations currently the longest valid nlattr-formatted flow key is
- * 80 bytes long, so this leaves some safety margin.
+/* Upper bound on the length of a nlattr-formatted flow key.  The longest
+ * nlattr-formatted flow key would be:
+ *
+ *                         struct  pad  nl hdr  total
+ *                         ------  ---  ------  -----
+ *  ODP_KEY_ATTR_TUN_ID        8    --     4     12
+ *  ODP_KEY_ATTR_IN_PORT       4    --     4      8
+ *  ODP_KEY_ATTR_ETHERNET     12    --     4     16
+ *  ODP_KEY_ATTR_8021Q         4    --     4      8
+ *  ODP_KEY_ATTR_ETHERTYPE     2     2     4      8
+ *  ODP_KEY_ATTR_IPV6         34     2     4     40
+ *  ODP_KEY_ATTR_ICMPV6        2     2     4      8
+ *  ODP_KEY_ATTR_ND           28    --     4     32
+ *  -------------------------------------------------
+ *  total                                       132
  */
-#define FLOW_BUFSIZE 96
+#define FLOW_BUFSIZE 132
 
 int flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);
 int flow_from_nlattrs(struct sw_flow_key *swkey, const struct nlattr *);