diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-25 02:21:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-25 02:21:45 -0500 |
| commit | c5e1fd8ccae09f574d6f978c90c2b968ee29030c (patch) | |
| tree | e4485dc086ce76c4ff2ff551246255f5de0a250b /net/ipv4/netfilter/nf_nat_proto_unknown.c | |
| parent | 60b778ce519625102d3f72a2071ea72a05e990ce (diff) | |
| parent | ceb98d03eac5704820f2ac1f370c9ff385e3a9f5 (diff) | |
| download | op-kernel-dev-c5e1fd8ccae09f574d6f978c90c2b968ee29030c.zip op-kernel-dev-c5e1fd8ccae09f574d6f978c90c2b968ee29030c.tar.gz | |
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/ipv4/netfilter/nf_nat_proto_unknown.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_unknown.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_proto_unknown.c b/net/ipv4/netfilter/nf_nat_proto_unknown.c index a50f2bc..e0afe81 100644 --- a/net/ipv4/netfilter/nf_nat_proto_unknown.c +++ b/net/ipv4/netfilter/nf_nat_proto_unknown.c @@ -27,7 +27,7 @@ static bool unknown_in_range(const struct nf_conntrack_tuple *tuple, } static void unknown_unique_tuple(struct nf_conntrack_tuple *tuple, - const struct nf_nat_range *range, + const struct nf_nat_ipv4_range *range, enum nf_nat_manip_type maniptype, const struct nf_conn *ct) { @@ -46,7 +46,6 @@ unknown_manip_pkt(struct sk_buff *skb, } const struct nf_nat_protocol nf_nat_unknown_protocol = { - /* .me isn't set: getting a ref to this cannot fail. */ .manip_pkt = unknown_manip_pkt, .in_range = unknown_in_range, .unique_tuple = unknown_unique_tuple, |
