Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

Jesse Gross says:

====================
[GIT net-next] Open vSwitch

Open vSwitch changes for net-next/3.14. Highlights are:
 * Performance improvements in the mechanism to get packets to userspace
   using memory mapped netlink and skb zero copy where appropriate.
 * Per-cpu flow stats in situations where flows are likely to be shared
   across CPUs. Standard flow stats are used in other situations to save
   memory and allocation time.
 * A handful of code cleanups and rationalization.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-01-06 19:48:38 -05:00
commit 39b6b2992f
17 changed files with 483 additions and 213 deletions

View file

@ -33,6 +33,9 @@
#include "vport.h"
#include "vport-internal_dev.h"
static void ovs_vport_record_error(struct vport *,
enum vport_err_type err_type);
/* List of statically compiled vport implementations. Don't forget to also
* add yours to the list at the bottom of vport.h. */
static const struct vport_ops *vport_ops_list[] = {
@ -396,7 +399,8 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
* If using the vport generic stats layer indicate that an error of the given
* type has occurred.
*/
void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)
static void ovs_vport_record_error(struct vport *vport,
enum vport_err_type err_type)
{
spin_lock(&vport->stats_lock);