Fix openflow.h compilation with GCC 2.95.

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

diff --git a/datapath/flow.h b/datapath/flow.h
index 5faeaf9..96c7215 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -67,6 +67,7 @@ struct sw_flow {
 
        uint32_t group_id;      /* Flow group ID (for QoS). */
        uint16_t max_idle;      /* Idle time before discarding (seconds). */
+       uint16_t priority;      /* Only used on entries with wildcards. */
        unsigned long timeout;  /* Expiration time (in jiffies). */
 
        /* FIXME?  Probably most flows have only a single action. */
@@ -74,10 +75,9 @@ struct sw_flow {
        struct ofp_action *actions;
 
        /* For use by table implementation. */
-       union {
-               struct list_head node;
-               struct hlist_node hnode;
-       } u;
+       struct list_head node;
+       struct list_head iter_node;
+       unsigned long serial;
 
        spinlock_t lock;         /* Lock this entry...mostly for stat updates */
        unsigned long init_time; /* When the flow was created (in jiffies). */