diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-07 01:48:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-07 01:48:38 +0100 |
| commit | 39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33 (patch) | |
| tree | c0fc4e2be0429bb4d7643e6b6f8f5a56212f9284 /net/openvswitch/vport.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | ovs: make functions local (diff) | |
| download | linux-39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33.tar.xz linux-39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33.zip | |
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>
Diffstat (limited to 'net/openvswitch/vport.h')
| -rw-r--r-- | net/openvswitch/vport.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index bc97ef7fa2af..d7e50a17396c 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -192,7 +192,6 @@ static inline struct vport *vport_from_priv(const void *priv) void ovs_vport_receive(struct vport *, struct sk_buff *, struct ovs_key_ipv4_tunnel *); -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 top of vport.c. */ |