diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 06:13:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 06:13:53 +0200 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /net/openvswitch/flow_table.c | |
| parent | Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/... (diff) | |
| parent | Linux 4.2-rc7 (diff) | |
| download | linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.xz linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.zip | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'net/openvswitch/flow_table.c')
| -rw-r--r-- | net/openvswitch/flow_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 4613df8c8290..65523948fb95 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -752,7 +752,7 @@ int ovs_flow_init(void) BUILD_BUG_ON(sizeof(struct sw_flow_key) % sizeof(long)); flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow) - + (num_possible_nodes() + + (nr_node_ids * sizeof(struct flow_stats *)), 0, 0, NULL); if (flow_cache == NULL) |