diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-18 00:20:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-18 00:20:57 -0400 |
| commit | ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78 (patch) | |
| tree | c5aedcc1ed4a9e9375e595de2cb189b8345c4d96 /net/openvswitch/flow.c | |
| parent | 96d8683483b7eb194609edd1afe9143a0467b7d3 (diff) | |
| parent | d3e1101c9b75574e68380b5cb10c9395fd8855de (diff) | |
| download | linux-ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78.tar.gz linux-ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78.tar.bz2 linux-ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
Two small bug fixes for net/3.9 including the issue previously
discussed where allocation of netlink notifications can fail after
changes have been committed.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow.c')
| -rw-r--r-- | net/openvswitch/flow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index fe0e4215c73d..67a2b783fe70 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -795,9 +795,9 @@ void ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow) void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow) { + BUG_ON(table->count == 0); hlist_del_rcu(&flow->hash_node[table->node_ver]); table->count--; - BUG_ON(table->count < 0); } /* The size of the argument for each %OVS_KEY_ATTR_* Netlink attribute. */ |