diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /net/sctp | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/endpointola.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 4c8d9f45ce09..905fda582b92 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c | |||
| @@ -111,7 +111,8 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, | |||
| 111 | if (sctp_addip_enable) { | 111 | if (sctp_addip_enable) { |
| 112 | auth_chunks->chunks[0] = SCTP_CID_ASCONF; | 112 | auth_chunks->chunks[0] = SCTP_CID_ASCONF; |
| 113 | auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK; | 113 | auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK; |
| 114 | auth_chunks->param_hdr.length += htons(2); | 114 | auth_chunks->param_hdr.length = |
| 115 | htons(sizeof(sctp_paramhdr_t) + 2); | ||
| 115 | } | 116 | } |
| 116 | } | 117 | } |
| 117 | 118 | ||