X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fflow.h;h=076448272b9c2dc1178bab4958704eea671cc56c;hb=49ad0403a79ed166fad156dd649f8f9d63fc9dc3;hp=b1e80057526489efde4af3496b70a7c435913f82;hpb=7956695a6c2f8fb3b69888f72a720c25af75e23b;p=openvswitch

diff --git a/datapath/flow.h b/datapath/flow.h
index b1e80057..07644827 100644
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -10,6 +10,7 @@
 #define FLOW_H 1
 
 #include <linux/kernel.h>
+#include <linux/netlink.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/rcupdate.h>
@@ -24,8 +25,8 @@ struct sk_buff;
 
 struct sw_flow_actions {
 	struct rcu_head rcu;
-	unsigned int n_actions;
-	union odp_action actions[];
+	u32 actions_len;
+	struct nlattr actions[];
 };
 
 struct sw_flow {
@@ -33,7 +34,7 @@ struct sw_flow {
 	struct tbl_node tbl_node;
 
 	struct odp_flow_key key;
-	struct sw_flow_actions *sf_acts;
+	struct sw_flow_actions __rcu *sf_acts;
 
 	atomic_t refcnt;
 	bool dead;
@@ -58,7 +59,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);
@@ -67,7 +68,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(size_t n_actions);
+struct sw_flow_actions *flow_actions_alloc(u32 actions_len);
 void flow_deferred_free_acts(struct sw_flow_actions *);
 
 void flow_hold(struct sw_flow *);