From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Fri, 3 Jan 2014 11:01:47 +0000 (+0100)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.1.90-1~9^2
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=4b0424809b823101c969a0691fc1db0c880ae64a

Merge branch 'mainstream'

Conflicts:
	Makefile.am
---

4b0424809b823101c969a0691fc1db0c880ae64a
diff --cc Makefile.am
index adb901bfa,857708f0c..670f5f0b2
--- a/Makefile.am
+++ b/Makefile.am
@@@ -159,10 -164,10 +165,10 @@@ dist-hook-git: distfile
  	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
  	  (cd datapath && $(MAKE) distfiles);				    \
  	  (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |	    \
- 	    sort -u > all-distfiles;					    \
 -	    LC_ALL=C sort -u > all-distfiles;				    \
 -	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |	    \
 -	    LC_ALL=C sort -u > all-gitfiles;				    \
 -	  LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
++	    LC_ALL=C sort -u > all-distfiles;					    \
 +	  (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |	    \
- 	    sort -u > all-gitfiles;					    \
- 	  comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
++	    LC_ALL=C sort -u > all-gitfiles;					    \
++	  LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
  	  if test -s missing-distfiles; then				    \
  	    echo "The distribution is missing the following files:";	    \
  	    cat missing-distfiles;					    \
diff --cc lib/dpif-netdev.c
index 11f010c84,6ef749566..0de602720
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@@ -1409,55 -1446,45 +1454,53 @@@ dp_netdev_execute_actions(struct dp_net
                            const struct nlattr *actions, size_t actions_len)
  {
      struct dp_netdev_execute_aux aux = {dp, key};
-     struct flow md = *key;   /* Packet metadata, may be modified by actions. */
  
-     odp_execute_actions(&aux, packet, &md, actions, actions_len,
-                         dp_netdev_action_output, dp_netdev_action_userspace);
+     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,				\
 +    dpif_netdev_run,					\
 +    dpif_netdev_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,			\
 +    dpif_netdev_get_max_ports,				\
 +    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_start,			\
 +    dpif_netdev_flow_dump_next,				\
 +    dpif_netdev_flow_dump_done,				\
 +    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,
 -    dpif_netdev_run,
 -    dpif_netdev_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,
 -    dpif_netdev_get_max_ports,
 -    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_start,
 -    dpif_netdev_flow_dump_next,
 -    dpif_netdev_flow_dump_done,
 -    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