X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=f09f76c4738be18fa9da762de4ac105d63204dd8;hb=36956a7d33c9ee204fcb184484a5aaacbd9ecef8;hp=808e731fc9d85cc04a3aac70f96ab3a20e81e4f0;hpb=78d18dbb55dcbcf0a59bc93b0c023ab7708d974c;p=sliver-openvswitch.git

diff --git a/datapath/flow.h b/datapath/flow.h
index 808e731fc..f09f76c47 100644
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -29,12 +29,27 @@ struct sw_flow_actions {
 	struct nlattr actions[];
 };
 
+struct sw_flow_key {
+	__be64	tun_id;     /* Encapsulating tunnel ID. */
+	__be32	nw_src;	    /* IP source address. */
+	__be32	nw_dst;	    /* IP destination 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. */
+	__be16	tp_src;	    /* TCP/UDP source port. */
+	__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 or lower 8 bits of ARP opcode. */
+	u8	nw_tos;	    /* IP ToS (DSCP field, 6 bits). */
+};
+
 struct sw_flow {
 	struct rcu_head rcu;
 	struct tbl_node tbl_node;
 
-	struct odp_flow_key key;
-	struct sw_flow_actions *sf_acts;
+	struct sw_flow_key key;
+	struct sw_flow_actions __rcu *sf_acts;
 
 	atomic_t refcnt;
 	bool dead;
@@ -59,7 +74,7 @@ struct arp_eth_header
 	unsigned char       ar_sip[4];		/* sender IP address        */
 	unsigned char       ar_tha[ETH_ALEN];	/* target hardware address  */
 	unsigned char       ar_tip[4];		/* target IP address        */
-} __attribute__((packed));
+} __packed;
 
 int flow_init(void);
 void flow_exit(void);
@@ -74,12 +89,20 @@ void flow_deferred_free_acts(struct sw_flow_actions *);
 void flow_hold(struct sw_flow *);
 void flow_put(struct sw_flow *);
 
-int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *, bool *is_frag);
+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 *);
 
-u32 flow_hash(const struct odp_flow_key *key);
+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.
+ */
+#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);
+
 static inline struct sw_flow *flow_cast(const struct tbl_node *node)
 {
 	return container_of(node, struct sw_flow, tbl_node);