datapath-windows: Make VPORT ovs number values smaller than MAXUINT16

[cascardo/ovs.git] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index eba2fc4..7dfd5af 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -57,7 +57,7 @@ struct dp_stats_percpu {
        u64 n_missed;
        u64 n_lost;
        u64 n_mask_hit;
-       struct u64_stats_sync sync;
+       struct u64_stats_sync syncp;
 };
 
 /**
@@ -96,14 +96,12 @@ struct datapath {
 
 /**
  * struct ovs_skb_cb - OVS data in skb CB
- * @pkt_key: The flow information extracted from the packet.  Must be nonnull.
  * @egress_tun_info: Tunnel information about this packet on egress path.
  * NULL if the packet is not being tunneled.
  * @input_vport: The original vport packet came in on. This value is cached
  * when a packet is received by OVS.
  */
 struct ovs_skb_cb {
-       struct sw_flow_key      *pkt_key;
        struct ovs_tunnel_info  *egress_tun_info;
        struct vport            *input_vport;
 };
@@ -154,7 +152,7 @@ int lockdep_ovsl_is_held(void);
 #define rcu_dereference_ovsl(p)                                        \
        rcu_dereference_check(p, lockdep_ovsl_is_held())
 
-static inline struct net *ovs_dp_get_net(struct datapath *dp)
+static inline struct net *ovs_dp_get_net(const struct datapath *dp)
 {
        return read_pnet(&dp->net);
 }
@@ -188,22 +186,26 @@ extern struct notifier_block ovs_dp_device_notifier;
 extern struct genl_family dp_vport_genl_family;
 extern struct genl_multicast_group ovs_dp_vport_multicast_group;
 
-void ovs_dp_process_packet(struct sk_buff *c);
+void ovs_dp_process_packet(struct sk_buff *, struct sw_flow_key *key);
 void ovs_dp_detach_port(struct vport *);
 int ovs_dp_upcall(struct datapath *, struct sk_buff *,
-                 const struct dp_upcall_info *);
+                 const struct sw_flow_key *, const struct dp_upcall_info *);
 
 const char *ovs_dp_name(const struct datapath *dp);
 struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 portid, u32 seq,
                                         u8 cmd);
 
 int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
-                       struct sw_flow_actions *acts);
+                       struct sw_flow_key *key,
+                       const struct sw_flow_actions *acts);
 void ovs_dp_notify_wq(struct work_struct *work);
 
-#define OVS_NLERR(fmt, ...)                                    \
+int action_fifos_init(void);
+void action_fifos_exit(void);
+
+#define OVS_NLERR(logging_allowed, fmt, ...)                   \
 do {                                                           \
-       if (net_ratelimit())                                    \
-               pr_info("netlink: " fmt, ##__VA_ARGS__);        \
+       if (logging_allowed && net_ratelimit())                 \
+               pr_info("netlink: " fmt "\n", ##__VA_ARGS__);   \
 } while (0)
 #endif /* datapath.h */