diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 07:45:37 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 07:45:37 +0200 |
| commit | 94d4ac2f4a58c6e37876827c6688c61cef21290c (patch) | |
| tree | 732f4e4794f3c116041242f69754637f75c0dd57 /net/sctp/endpointola.c | |
| parent | x86: cleanup in amd_cpu_notify() (diff) | |
| parent | x86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe (diff) | |
| download | linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.xz linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.zip | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'net/sctp/endpointola.c')
| -rw-r--r-- | net/sctp/endpointola.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index e39a0cdef184..4c8d9f45ce09 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -103,6 +103,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, /* Initialize the CHUNKS parameter */ auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS; + auth_chunks->param_hdr.length = htons(sizeof(sctp_paramhdr_t)); /* If the Add-IP functionality is enabled, we must * authenticate, ASCONF and ASCONF-ACK chunks @@ -110,8 +111,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, if (sctp_addip_enable) { auth_chunks->chunks[0] = SCTP_CID_ASCONF; auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK; - auth_chunks->param_hdr.length = - htons(sizeof(sctp_paramhdr_t) + 2); + auth_chunks->param_hdr.length += htons(2); } } |