From 7a64ea94d844d60028cac6cdc0c3cc5c8c1dbe56 Mon Sep 17 00:00:00 2001 From: Vladislav Yasevich Date: Fri, 19 May 2006 11:52:20 -0700 Subject: [PATCH] --- yaml --- r: 26807 b: refs/heads/master c: dd2d1c6f2958d027e4591ca5d2a04dfe36ca6512 h: refs/heads/master i: 26805: 3ef9c924fafff1c799503e15c5723ad0f22cf1d1 26803: d00cc31cce792921d97124aea37da862cc926d92 26799: 9c3716303fc6d8bf7d12c8e1e4c78f4e5c10b209 v: v3 --- [refs] | 2 +- trunk/include/net/sctp/sctp.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a54541af3c2e..6490b8022195 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61c9fed41638249f8b6ca5345064eb1beb50179f +refs/heads/master: dd2d1c6f2958d027e4591ca5d2a04dfe36ca6512 diff --git a/trunk/include/net/sctp/sctp.h b/trunk/include/net/sctp/sctp.h index e673b2c984e9..aa6033ca7cd8 100644 --- a/trunk/include/net/sctp/sctp.h +++ b/trunk/include/net/sctp/sctp.h @@ -461,12 +461,12 @@ static inline int sctp_frag_point(const struct sctp_sock *sp, int pmtu) * there is room for a param header too. */ #define sctp_walk_params(pos, chunk, member)\ -_sctp_walk_params((pos), (chunk), WORD_ROUND(ntohs((chunk)->chunk_hdr.length)), member) +_sctp_walk_params((pos), (chunk), ntohs((chunk)->chunk_hdr.length), member) #define _sctp_walk_params(pos, chunk, end, member)\ for (pos.v = chunk->member;\ pos.v <= (void *)chunk + end - sizeof(sctp_paramhdr_t) &&\ - pos.v <= (void *)chunk + end - WORD_ROUND(ntohs(pos.p->length)) &&\ + pos.v <= (void *)chunk + end - ntohs(pos.p->length) &&\ ntohs(pos.p->length) >= sizeof(sctp_paramhdr_t);\ pos.v += WORD_ROUND(ntohs(pos.p->length))) @@ -477,7 +477,7 @@ _sctp_walk_errors((err), (chunk_hdr), ntohs((chunk_hdr)->length)) for (err = (sctp_errhdr_t *)((void *)chunk_hdr + \ sizeof(sctp_chunkhdr_t));\ (void *)err <= (void *)chunk_hdr + end - sizeof(sctp_errhdr_t) &&\ - (void *)err <= (void *)chunk_hdr + end - WORD_ROUND(ntohs(err->length)) &&\ + (void *)err <= (void *)chunk_hdr + end - ntohs(err->length) &&\ ntohs(err->length) >= sizeof(sctp_errhdr_t); \ err = (sctp_errhdr_t *)((void *)err + WORD_ROUND(ntohs(err->length))))