ofproto: Fix encoding of NXST_* replies.

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

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 63f7dd4..aa859f6 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -161,7 +161,7 @@ struct tnl_vport {
        char name[IFNAMSIZ];
        const struct tnl_ops *tnl_ops;
 
-       struct tnl_mutable_config *mutable;     /* Protected by RCU. */
+       struct tnl_mutable_config __rcu *mutable;
 
        /*
         * ID of last fragment sent (for tunnel protocols with direct support
@@ -171,7 +171,7 @@ struct tnl_vport {
        atomic_t frag_id;
 
        spinlock_t cache_lock;
-       struct tnl_cache *cache;                /* Protected by RCU/cache_lock. */
+       struct tnl_cache __rcu *cache;          /* Protected by RCU/cache_lock. */
 
 #ifdef NEED_CACHE_TIMEOUT
        /*
@@ -186,7 +186,7 @@ struct tnl_vport {
 
 struct vport *tnl_create(const struct vport_parms *, const struct vport_ops *,
                         const struct tnl_ops *);
-int tnl_modify(struct vport *, const void __user *config);
+int tnl_modify(struct vport *, struct odp_port *);
 int tnl_destroy(struct vport *);
 int tnl_set_mtu(struct vport *vport, int mtu);
 int tnl_set_addr(struct vport *vport, const unsigned char *addr);
@@ -196,12 +196,12 @@ int tnl_get_mtu(const struct vport *vport);
 int tnl_send(struct vport *vport, struct sk_buff *skb);
 void tnl_rcv(struct vport *vport, struct sk_buff *skb);
 
-struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be32 key,
+struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be64 key,
                            int tunnel_type,
                            const struct tnl_mutable_config **mutable);
 bool tnl_frag_needed(struct vport *vport,
                     const struct tnl_mutable_config *mutable,
-                    struct sk_buff *skb, unsigned int mtu, __be32 flow_key);
+                    struct sk_buff *skb, unsigned int mtu, __be64 flow_key);
 void tnl_free_linked_skbs(struct sk_buff *skb);
 
 static inline struct tnl_vport *tnl_vport_priv(const struct vport *vport)