projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
net
/
netfilter
/
nf_conntrack_proto_sctp.c
diff --git
a/net/netfilter/nf_conntrack_proto_sctp.c
b/net/netfilter/nf_conntrack_proto_sctp.c
index
30aa5b9
..
ae8c260
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_sctp.c
+++ b/
net/netfilter/nf_conntrack_proto_sctp.c
@@
-287,7
+287,7
@@
static int sctp_packet(struct nf_conn *ct,
const struct sk_buff *skb,
unsigned int dataoff,
enum ip_conntrack_info ctinfo,
const struct sk_buff *skb,
unsigned int dataoff,
enum ip_conntrack_info ctinfo,
-
in
t pf,
+
u_int8_
t pf,
unsigned int hooknum)
{
enum sctp_conntrack new_state, old_state;
unsigned int hooknum)
{
enum sctp_conntrack new_state, old_state;
@@
-369,7
+369,7
@@
static int sctp_packet(struct nf_conn *ct,
ct->proto.sctp.state = new_state;
if (old_state != new_state)
ct->proto.sctp.state = new_state;
if (old_state != new_state)
- nf_conntrack_event_cache(IPCT_PROTOINFO,
skb
);
+ nf_conntrack_event_cache(IPCT_PROTOINFO,
ct
);
}
write_unlock_bh(&sctp_lock);
}
write_unlock_bh(&sctp_lock);
@@
-380,7
+380,7
@@
static int sctp_packet(struct nf_conn *ct,
new_state == SCTP_CONNTRACK_ESTABLISHED) {
pr_debug("Setting assured bit\n");
set_bit(IPS_ASSURED_BIT, &ct->status);
new_state == SCTP_CONNTRACK_ESTABLISHED) {
pr_debug("Setting assured bit\n");
set_bit(IPS_ASSURED_BIT, &ct->status);
- nf_conntrack_event_cache(IPCT_STATUS,
skb
);
+ nf_conntrack_event_cache(IPCT_STATUS,
ct
);
}
return NF_ACCEPT;
}
return NF_ACCEPT;