diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-02 22:07:58 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-02 22:07:58 (GMT) |
| commit | 83bf2e4089bebc2c7fd14a79de5954b26fe8d4af (patch) | |
| tree | ab2cb1f229ba4c2d7236406c997e41a223daf74d /net/ipv4/netfilter/nf_nat_proto_unknown.c | |
| parent | de38483010bae523f533bb6bf9f7b7353772f6eb (diff) | |
| parent | 6661481d5a8975657742c7ed40ae16bdaa7d0a6e (diff) | |
| download | linux-fsl-qoriq-83bf2e4089bebc2c7fd14a79de5954b26fe8d4af.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv4/netfilter/nf_nat_proto_unknown.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_unknown.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_proto_unknown.c b/net/ipv4/netfilter/nf_nat_proto_unknown.c index 14381c6..a50f2bc 100644 --- a/net/ipv4/netfilter/nf_nat_proto_unknown.c +++ b/net/ipv4/netfilter/nf_nat_proto_unknown.c @@ -26,14 +26,14 @@ static bool unknown_in_range(const struct nf_conntrack_tuple *tuple, return true; } -static bool unknown_unique_tuple(struct nf_conntrack_tuple *tuple, +static void unknown_unique_tuple(struct nf_conntrack_tuple *tuple, const struct nf_nat_range *range, enum nf_nat_manip_type maniptype, const struct nf_conn *ct) { /* Sorry: we can't help you; if it's not unique, we can't frob anything. */ - return false; + return; } static bool |