nicira-ext: Support matching IPv6 traffic.

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

diff --git a/datapath/flow.h b/datapath/flow.h
index f09f76c..ee1c4c9 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -31,8 +31,16 @@ 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 {
+                       __be32  ipv6_src[4]; /* IPv6 source address. */
+                       __be32  ipv6_dst[4]; /* IPv6 source 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,6 +50,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. */
 };
 
 struct sw_flow {
@@ -83,7 +93,7 @@ struct sw_flow *flow_alloc(void);
 void flow_deferred_free(struct sw_flow *);
 void flow_free_tbl(struct tbl_node *);
 
-struct sw_flow_actions *flow_actions_alloc(u32 actions_len);
+struct sw_flow_actions *flow_actions_alloc(const struct nlattr *);
 void flow_deferred_free_acts(struct sw_flow_actions *);
 
 void flow_hold(struct sw_flow *);
@@ -91,6 +101,7 @@ void flow_put(struct sw_flow *);
 
 int flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, bool *is_frag);
 void flow_used(struct sw_flow *, struct sk_buff *);
+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);
@@ -100,8 +111,8 @@ int flow_cmp(const struct tbl_node *, void *target);
  */
 #define FLOW_BUFSIZE 96
 
-int flow_copy_from_user(struct sw_flow_key *, const struct nlattr __user *ukey, u32 key_len);
-int flow_copy_to_user(struct nlattr __user *ukey, const struct sw_flow_key *, u32 key_len);
+int flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);
+int flow_from_nlattrs(struct sw_flow_key *swkey, const struct nlattr *);
 
 static inline struct sw_flow *flow_cast(const struct tbl_node *node)
 {