diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-15 01:41:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-15 01:41:10 -0700 |
| commit | 09a8f03197d4799bc9969b35240e5606c026ded6 (patch) | |
| tree | cdd3f2d2a3eb8c22c57b9e6a5384df824e52417f /net/openvswitch/flow.c | |
| parent | 2fdac010bdcf10a30711b6924612dfc40daf19b8 (diff) | |
| parent | 36bf5cc66d60868bcc10aff209defed5a7b71c1d (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
Three bug fixes that are fairly small either way but resolve obviously
incorrect code. For net/3.11.
====================
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 5c519b121e1..1aa84dc5877 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -240,7 +240,7 @@ static struct flex_array *alloc_buckets(unsigned int n_buckets) struct flex_array *buckets; int i, err; - buckets = flex_array_alloc(sizeof(struct hlist_head *), + buckets = flex_array_alloc(sizeof(struct hlist_head), n_buckets, GFP_KERNEL); if (!buckets) return NULL; |