From 8232b651e32e19ebe1970775d7411ce09e903c2a Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 20 Nov 2006 17:26:08 -0800 Subject: [PATCH] --- yaml --- r: 41847 b: refs/heads/master c: 962c837275e8a8c1df41f1882e971636093cdee4 h: refs/heads/master i: 41845: 65b1f209dc5b9b6226a9957a79bee9d529b74a38 41843: 6038d5584d7ea7ab449508c57917a01743a53c0c 41839: 1cf9a88099eea751293e7c83c0433f695e42ff1b v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/nf_conntrack_sctp.h | 2 +- trunk/net/netfilter/xt_sctp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6ce6f336c159..11914055e25a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dbe86566ed262dae3b5472b9360cb5b65d42716 +refs/heads/master: 962c837275e8a8c1df41f1882e971636093cdee4 diff --git a/trunk/include/linux/netfilter/nf_conntrack_sctp.h b/trunk/include/linux/netfilter/nf_conntrack_sctp.h index b8994d9fd1a9..5cf2c115cce4 100644 --- a/trunk/include/linux/netfilter/nf_conntrack_sctp.h +++ b/trunk/include/linux/netfilter/nf_conntrack_sctp.h @@ -20,7 +20,7 @@ struct ip_ct_sctp { enum sctp_conntrack state; - u_int32_t vtag[IP_CT_DIR_MAX]; + __be32 vtag[IP_CT_DIR_MAX]; u_int32_t ttag[IP_CT_DIR_MAX]; }; diff --git a/trunk/net/netfilter/xt_sctp.c b/trunk/net/netfilter/xt_sctp.c index 7956acaaa24b..71bf036f833c 100644 --- a/trunk/net/netfilter/xt_sctp.c +++ b/trunk/net/netfilter/xt_sctp.c @@ -71,7 +71,7 @@ match_packet(const struct sk_buff *skb, duprintf("Chunk num: %d\toffset: %d\ttype: %d\tlength: %d\tflags: %x\n", ++i, offset, sch->type, htons(sch->length), sch->flags); - offset += (htons(sch->length) + 3) & ~3; + offset += (ntohs(sch->length) + 3) & ~3; duprintf("skb->len: %d\toffset: %d\n", skb->len, offset);