diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:15:34 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-22 12:51:05 +0000 |
commit | 28aa2be47924f6b971a6d323b3b4083228c8214f (patch) | |
tree | 0a8b1ee3d68f262338fb2e9e17badc3557f4f8c4 /net/netfilter/nft_compat.c | |
parent | a6b8ad1106ba7e875e1ea94657f19eb0636ce0b2 (diff) | |
parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.11
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'net/netfilter/nft_compat.c')
-rw-r--r-- | net/netfilter/nft_compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c index 82cb8236f8a1..ad979612238a 100644 --- a/net/netfilter/nft_compat.c +++ b/net/netfilter/nft_compat.c @@ -678,7 +678,7 @@ nft_target_select_ops(const struct nft_ctx *ctx, family = ctx->afi->family; /* Re-use the existing target if it's already loaded. */ - list_for_each_entry(nft_target, &nft_match_list, head) { + list_for_each_entry(nft_target, &nft_target_list, head) { struct xt_target *target = nft_target->ops.data; if (strcmp(target->name, tg_name) == 0 && |