diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
| commit | c6df33694dbe813e34da1f893cbc08a5822a26d7 (patch) | |
| tree | c73e8332df16575a2a6dedbc0fc8a34b5ddc6587 /net/ipv6/ip6mr.c | |
| parent | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (diff) | |
| parent | 974070b95b0c8ff6ef0d62109c16aea160cf3c7c (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.11-androidlsk-v3.10-15.10-android
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 63cf7cded36d..6bd21ad93b2f 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -552,7 +552,7 @@ static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v) if (it->cache == &mrt->mfc6_unres_queue) spin_unlock_bh(&mfc_unres_lock); - else if (it->cache == mrt->mfc6_cache_array) + else if (it->cache == &mrt->mfc6_cache_array[it->ct]) read_unlock(&mrt_lock); } |