From bd85e1b107a0b6865a3a7f18254f6e20eff7541e Mon Sep 17 00:00:00 2001 From: dpward Date: Wed, 31 Aug 2011 06:05:27 +0000 Subject: [PATCH] --- yaml --- r: 263898 b: refs/heads/master c: 0542b69e2c57fc9668ce6a03155bea6e1f557901 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/flow.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5d8cac23991b..3713b90804f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02009afc223aae43b8e18918fc816e4520791537 +refs/heads/master: 0542b69e2c57fc9668ce6a03155bea6e1f557901 diff --git a/trunk/net/core/flow.c b/trunk/net/core/flow.c index bf32c33cad3b..47b6d26c2afb 100644 --- a/trunk/net/core/flow.c +++ b/trunk/net/core/flow.c @@ -30,6 +30,7 @@ struct flow_cache_entry { struct hlist_node hlist; struct list_head gc_list; } u; + struct net *net; u16 family; u8 dir; u32 genid; @@ -232,7 +233,8 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, hash = flow_hash_code(fc, fcp, key); hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) { - if (tfle->family == family && + if (tfle->net == net && + tfle->family == family && tfle->dir == dir && flow_key_compare(key, &tfle->key) == 0) { fle = tfle; @@ -246,6 +248,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC); if (fle) { + fle->net = net; fle->family = family; fle->dir = dir; memcpy(&fle->key, key, sizeof(*key));