diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-02 15:24:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-02 15:24:48 -0800 |
| commit | 8fe73503fae8cb8f00c80dd6444c1ddcd19257bd (patch) | |
| tree | 39cc6d38a628c445da7d52c006df6930a2c58411 /net/netfilter/nf_conntrack_netlink.c | |
| parent | 123b9731b14f49cd41c91ed2b6c31e515615347c (diff) | |
| parent | 9291747f118d6404e509747b85ff5f6dfec368d2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 3fec12c570a8..b4df3eff4240 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -803,7 +803,7 @@ static const struct nla_policy tuple_nla_policy[CTA_TUPLE_MAX+1] = { static int ctnetlink_parse_tuple(const struct nlattr * const cda[], struct nf_conntrack_tuple *tuple, - enum ctattr_tuple type, u_int8_t l3num) + enum ctattr_type type, u_int8_t l3num) { struct nlattr *tb[CTA_TUPLE_MAX+1]; int err; |