Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.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 41183a4d2d621f41ac4662bfc411feebdd673e80..ae8c2609e230b6323598521f8cc606bac7c5074e 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,
-                      int pf,
+                      u_int8_t pf,
                       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)
-                       nf_conntrack_event_cache(IPCT_PROTOINFO, skb);
+                       nf_conntrack_event_cache(IPCT_PROTOINFO, ct);
        }
        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);
-               nf_conntrack_event_cache(IPCT_STATUS, skb);
+               nf_conntrack_event_cache(IPCT_STATUS, ct);
        }
 
        return NF_ACCEPT;
@@ -482,11 +482,11 @@ static int sctp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
 
        NLA_PUT_BE32(skb,
                     CTA_PROTOINFO_SCTP_VTAG_ORIGINAL,
-                    htonl(ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL]));
+                    ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL]);
 
        NLA_PUT_BE32(skb,
                     CTA_PROTOINFO_SCTP_VTAG_REPLY,
-                    htonl(ct->proto.sctp.vtag[IP_CT_DIR_REPLY]));
+                    ct->proto.sctp.vtag[IP_CT_DIR_REPLY]);
 
        read_unlock_bh(&sctp_lock);
 
@@ -530,9 +530,9 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct)
        write_lock_bh(&sctp_lock);
        ct->proto.sctp.state = nla_get_u8(tb[CTA_PROTOINFO_SCTP_STATE]);
        ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL] =
-               ntohl(nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_ORIGINAL]));
+               nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_ORIGINAL]);
        ct->proto.sctp.vtag[IP_CT_DIR_REPLY] =
-               ntohl(nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_REPLY]));
+               nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_REPLY]);
        write_unlock_bh(&sctp_lock);
 
        return 0;