diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 09:50:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 09:50:38 -0700 |
| commit | 364ae953a48152be11f1aa424cbfd943b7762b0d (patch) | |
| tree | 6873b352af1aa2dd6baa223b951eff4d6e74b1ae /net/netfilter/nf_conntrack_proto_generic.c | |
| parent | 075f664689b40217539ebfe856fab73d302a15f1 (diff) | |
| parent | f39a9410ed0503278fd5edc559fa019051413039 (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_proto_generic.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c index e31b0e7bd0b..dbe680af85d 100644 --- a/net/netfilter/nf_conntrack_proto_generic.c +++ b/net/netfilter/nf_conntrack_proto_generic.c @@ -45,7 +45,7 @@ static int packet(struct nf_conn *ct, const struct sk_buff *skb, unsigned int dataoff, enum ip_conntrack_info ctinfo, - int pf, + u_int8_t pf, unsigned int hooknum) { nf_ct_refresh_acct(ct, ctinfo, skb, nf_ct_generic_timeout); |