diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-06 01:25:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-06 01:25:53 +0100 |
| commit | 028b86b7671d17eb9a614924eb46d5efb9db931a (patch) | |
| tree | 7f8c0ce1c7a72f88b1daaae81c6c1f785b08fff9 /net/openvswitch/flow_table.h | |
| parent | xen-netback: Fix Rx stall due to race condition (diff) | |
| parent | openvswitch: Suppress error messages on megaflow updates (diff) | |
| download | linux-028b86b7671d17eb9a614924eb46d5efb9db931a.tar.xz linux-028b86b7671d17eb9a614924eb46d5efb9db931a.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
Open vSwitch
A handful of bug fixes for net/3.14. High level fixes are:
* Regressions introduced by the zerocopy changes, particularly with
old userspaces.
* A few bugs lingering from the introduction of megaflows.
* Overly zealous error checking that is now being triggered frequently
in common cases.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow_table.h')
| -rw-r--r-- | net/openvswitch/flow_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h index 1996e34c0fd8..baaeb101924d 100644 --- a/net/openvswitch/flow_table.h +++ b/net/openvswitch/flow_table.h @@ -60,7 +60,7 @@ void ovs_flow_free(struct sw_flow *, bool deferred); int ovs_flow_tbl_init(struct flow_table *); int ovs_flow_tbl_count(struct flow_table *table); -void ovs_flow_tbl_destroy(struct flow_table *table); +void ovs_flow_tbl_destroy(struct flow_table *table, bool deferred); int ovs_flow_tbl_flush(struct flow_table *flow_table); int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, |