windows: Avoid OVS_UNUSED in Windows stubs for syslog.h.

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

diff --git a/datapath/datapath.h b/datapath/datapath.h
index d6dee50..fdf35f0 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -32,8 +32,8 @@
 #include "vlan.h"
 #include "vport.h"
 
-#define DP_MAX_PORTS           USHRT_MAX
-#define DP_VPORT_HASH_BUCKETS  1024
+#define DP_MAX_PORTS           USHRT_MAX
+#define DP_VPORT_HASH_BUCKETS  1024
 
 #define SAMPLE_ACTION_DEPTH 3
 
@@ -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,35 +96,32 @@ struct datapath {
 
 /**
  * struct ovs_skb_cb - OVS data in skb CB
- * @flow: The flow associated with this packet.  May be %NULL if no flow.
- * @pkt_key: The flow information extracted from the packet.  Must be nonnull.
- * @tun_key: Key for the tunnel that encapsulated this packet. NULL if the
+ * @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          *flow;
-       struct sw_flow_key      *pkt_key;
-       struct ovs_tunnel_info  *tun_info;
-       struct vport    *input_vport;
+       struct ovs_tunnel_info  *egress_tun_info;
+       struct vport            *input_vport;
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
 
 /**
  * struct dp_upcall - metadata to include with a packet to send to userspace
  * @cmd: One of %OVS_PACKET_CMD_*.
- * @key: Becomes %OVS_PACKET_ATTR_KEY.  Must be nonnull.
  * @userdata: If nonnull, its variable-length value is passed to userspace as
  * %OVS_PACKET_ATTR_USERDATA.
- * @portid: Netlink PID to which packet should be sent.  If @portid is 0 then no
- * packet is sent and the packet is accounted in the datapath's @n_lost
+ * @portid: Netlink portid to which packet should be sent.  If @portid is 0
+ * then no packet is sent and the packet is accounted in the datapath's @n_lost
  * counter.
+ * @egress_tun_info: If nonnull, becomes %OVS_PACKET_ATTR_EGRESS_TUN_KEY.
  */
 struct dp_upcall_info {
-       u8 cmd;
-       const struct sw_flow_key *key;
+       const struct ovs_tunnel_info *egress_tun_info;
        const struct nlattr *userdata;
        u32 portid;
+       u8 cmd;
 };
 
 /**
@@ -135,8 +132,8 @@ struct dp_upcall_info {
  */
 struct ovs_net {
        struct list_head dps;
-       struct vport_net vport_net;
        struct work_struct dp_notify_work;
+       struct vport_net vport_net;
 };
 
 extern int ovs_net_id;
@@ -149,13 +146,13 @@ int lockdep_ovsl_is_held(void);
 #define lockdep_ovsl_is_held() 1
 #endif
 
-#define ASSERT_OVSL()          WARN_ON(unlikely(!lockdep_ovsl_is_held()))
+#define ASSERT_OVSL()          WARN_ON(!lockdep_ovsl_is_held())
 #define ovsl_dereference(p)                                    \
        rcu_dereference_protected(p, lockdep_ovsl_is_held())
 #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);
 }
@@ -189,23 +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_received_packet(struct sk_buff *);
-void ovs_dp_process_packet_with_key(struct sk_buff *,
-                                   struct sw_flow_key *pkt_key, bool recirc);
+void ovs_dp_process_packet(struct sk_buff *skb, 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,
+struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
                                         u8 cmd);
 
-int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, bool recirc);
+int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
+                       const struct sw_flow_actions *, struct sw_flow_key *);
+
 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 */