diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:33:44 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:33:44 +1100 |
| commit | 0a77dc92b78183b5126b880e07b0c79cb89f7943 (patch) | |
| tree | be33c735659d7d61b9d79fd086e665b54dc4cdee /net/netfilter | |
| parent | 8db2eedc1fcde30a79316efa5a055cb1e5402a4b (diff) | |
| parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_set.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/xt_set.c b/net/netfilter/xt_set.c index e7c4e0e01ff5..80c2e2d603e0 100644 --- a/net/netfilter/xt_set.c +++ b/net/netfilter/xt_set.c @@ -84,7 +84,7 @@ set_match_v0_checkentry(const struct xt_mtchk_param *par) index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); if (index == IPSET_INVALID_ID) { - pr_warning("Cannot find set indentified by id %u to match\n", + pr_warning("Cannot find set identified by id %u to match\n", info->match_set.index); return -ENOENT; } @@ -134,7 +134,7 @@ set_match_v1_checkentry(const struct xt_mtchk_param *par) index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); if (index == IPSET_INVALID_ID) { - pr_warning("Cannot find set indentified by id %u to match\n", + pr_warning("Cannot find set identified by id %u to match\n", info->match_set.index); return -ENOENT; } |