From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Sun, 2 Mar 2014 16:11:50 +0000 (+0100)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.2.90-1~9
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=3ba9c6a5a5468626dcfeb1f9a750bb0efc8c6a7a

Merge branch 'mainstream'

Conflicts:
	lib/dpif-netdev.c
---

3ba9c6a5a5468626dcfeb1f9a750bb0efc8c6a7a
diff --cc lib/dpif-netdev.c
index b1c25c82b,5897f8bae..5aff18a2c
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@@ -1838,48 -1863,43 +1871,51 @@@ dp_netdev_execute_actions(struct dp_net
      odp_execute_actions(&aux, packet, md, actions, actions_len, dp_execute_cb);
  }
  
 +#define DPIF_NETDEV_CLASS_FUNCTIONS			\
 +    dpif_netdev_enumerate,				\
 +    dpif_netdev_port_open_type,				\
 +    dpif_netdev_open,					\
 +    dpif_netdev_close,					\
 +    dpif_netdev_destroy,				\
 +    NULL,					\
 +    NULL,					\
 +    dpif_netdev_get_stats,				\
 +    dpif_netdev_port_add,				\
 +    dpif_netdev_port_del,				\
 +    dpif_netdev_port_query_by_number,			\
 +    dpif_netdev_port_query_by_name,			\
 +    NULL,                       /* port_get_pid */	\
 +    dpif_netdev_port_dump_start,			\
 +    dpif_netdev_port_dump_next,				\
 +    dpif_netdev_port_dump_done,				\
 +    dpif_netdev_port_poll,				\
 +    dpif_netdev_port_poll_wait,				\
 +    dpif_netdev_flow_get,				\
 +    dpif_netdev_flow_put,				\
 +    dpif_netdev_flow_del,				\
 +    dpif_netdev_flow_flush,				\
++    dpif_netdev_flow_dump_state_init,   \
 +    dpif_netdev_flow_dump_start,			\
 +    dpif_netdev_flow_dump_next,				\
++    NULL,                                   \
 +    dpif_netdev_flow_dump_done,				\
++    dpif_netdev_flow_dump_state_uninit,     \
 +    dpif_netdev_execute,				\
 +    NULL,                       /* operate */		\
 +    dpif_netdev_recv_set,				\
 +    dpif_netdev_queue_to_priority,			\
 +    dpif_netdev_recv,					\
 +    dpif_netdev_recv_wait,				\
 +    dpif_netdev_recv_purge,				\
 +
  const struct dpif_class dpif_netdev_class = {
      "netdev",
 -    dpif_netdev_enumerate,
 -    dpif_netdev_port_open_type,
 -    dpif_netdev_open,
 -    dpif_netdev_close,
 -    dpif_netdev_destroy,
 -    NULL,                       /* run */
 -    NULL,                       /* wait */
 -    dpif_netdev_get_stats,
 -    dpif_netdev_port_add,
 -    dpif_netdev_port_del,
 -    dpif_netdev_port_query_by_number,
 -    dpif_netdev_port_query_by_name,
 -    NULL,                       /* port_get_pid */
 -    dpif_netdev_port_dump_start,
 -    dpif_netdev_port_dump_next,
 -    dpif_netdev_port_dump_done,
 -    dpif_netdev_port_poll,
 -    dpif_netdev_port_poll_wait,
 -    dpif_netdev_flow_get,
 -    dpif_netdev_flow_put,
 -    dpif_netdev_flow_del,
 -    dpif_netdev_flow_flush,
 -    dpif_netdev_flow_dump_state_init,
 -    dpif_netdev_flow_dump_start,
 -    dpif_netdev_flow_dump_next,
 -    NULL,
 -    dpif_netdev_flow_dump_done,
 -    dpif_netdev_flow_dump_state_uninit,
 -    dpif_netdev_execute,
 -    NULL,                       /* operate */
 -    dpif_netdev_recv_set,
 -    dpif_netdev_queue_to_priority,
 -    dpif_netdev_recv,
 -    dpif_netdev_recv_wait,
 -    dpif_netdev_recv_purge,
 +    DPIF_NETDEV_CLASS_FUNCTIONS
 +};
 +
 +const struct dpif_class dpif_planetlab_class = {
 +    "planetlab",
 +    DPIF_NETDEV_CLASS_FUNCTIONS
  };
  
  static void