X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Ftable_t.c;h=a824804b448a2d8e9d7414dab814465b725bc159;hb=9da88ee2ad791e259a8c88ba2fc116830293aaf5;hp=3cc6a58df4e742e47690178461f2af9365773c24;hpb=d1d2f3f3211e123c6080fa51f127419ccb2441c5;p=sliver-openvswitch.git

diff --git a/datapath/table_t.c b/datapath/table_t.c
index 3cc6a58df..a824804b4 100644
--- a/datapath/table_t.c
+++ b/datapath/table_t.c
@@ -35,15 +35,15 @@ static struct sw_flow *flow_zalloc(int n_actions, gfp_t flags)
 {
 	struct sw_flow *flow = flow_alloc(n_actions, flags);
 	if (flow) {
-		struct ofp_action *actions = flow->actions;
+		struct sw_flow_actions *sfa = flow->sf_acts;
 		memset(flow, 0, sizeof *flow);
-		flow->actions = actions;
+		flow->sf_acts = sfa;
 	}
 	return flow;
 }
 
 static void
-simple_insert_delete(struct sw_table *swt, uint16_t wildcards)
+simple_insert_delete(struct sw_table *swt, uint32_t wildcards)
 {
 	struct sw_flow *a_flow = flow_zalloc(0, GFP_KERNEL);
 	struct sw_flow *b_flow = flow_zalloc(0, GFP_KERNEL);
@@ -81,7 +81,7 @@ simple_insert_delete(struct sw_table *swt, uint16_t wildcards)
 }
 
 static void
-multiple_insert_destroy(struct sw_table *swt, int inserts, uint16_t wildcards,
+multiple_insert_destroy(struct sw_table *swt, int inserts, uint32_t wildcards,
 			int min_collisions, int max_collisions)
 {
 	int i;
@@ -124,7 +124,7 @@ multiple_insert_destroy(struct sw_table *swt, int inserts, uint16_t wildcards,
 }
 
 static void
-set_random_key(struct sw_flow_key *key, uint16_t wildcards)
+set_random_key(struct sw_flow_key *key, uint32_t wildcards)
 {
 	key->nw_src = random32();
 	key->nw_dst = random32();
@@ -156,7 +156,7 @@ struct flow_key_entry {
  */
 
 static struct flow_key_entry *
-allocate_random_keys(int n_keys, uint16_t wildcards)
+allocate_random_keys(int n_keys, uint32_t wildcards)
 {
 	struct flow_key_entry *entries, *pos;
 	struct list_head *keys;
@@ -423,7 +423,7 @@ check_lookup_and_iter(struct sw_table *swt, struct list_head *deleted,
  */
 
 static int
-iterator_test(struct sw_table *swt, int n_flows, uint16_t wildcards)
+iterator_test(struct sw_table *swt, int n_flows, uint32_t wildcards)
 {
 	struct flow_key_entry *allocated, h1, h2;
 	struct list_head *added, *deleted, *tmp;
@@ -506,7 +506,7 @@ iterator_test_destr:
  */
 
 static int
-add_test(struct sw_table *swt, uint16_t wildcards)
+add_test(struct sw_table *swt, uint32_t wildcards)
 {
 	struct flow_key_entry *allocated, h1, h2;
 	struct list_head *added, *deleted, *tmp, *tmp2;
@@ -599,7 +599,7 @@ add_test_destr:
  */
 
 static int
-delete_test(struct sw_table *swt, uint16_t wildcards)
+delete_test(struct sw_table *swt, uint32_t wildcards)
 {
 	struct flow_key_entry *allocated, h1, h2;
 	struct list_head *added, *deleted, *tmp, *tmp2;
@@ -700,7 +700,7 @@ delete_test_destr:
  */
 
 static int
-complex_add_delete_test(struct sw_table *swt, int n_flows, int i, uint16_t wildcards)
+complex_add_delete_test(struct sw_table *swt, int n_flows, int i, uint32_t wildcards)
 {
 	struct flow_key_entry *allocated, h1, h2;
 	struct list_head *added, *deleted, *tmp;