diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 11:30:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 11:30:22 -0500 |
| commit | 8edf51a5ee38eb40de5449e131fd36450a229430 (patch) | |
| tree | d2c5cd3b9a16a09a933ec345e12eb9272bcd0e67 /net/sctp/sm_make_chunk.c | |
| parent | b3277dfaf0257221f83dd861b82c54de4507473e (diff) | |
| parent | 483479ecc565b7f5845997138eddf5ecbc2684b1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4] devinet: inetdev_init out label moved after RCU assignment
[INET]: style updates for the inet_sock->is_icsk assignment fix
[SCTP]: Fix err_hdr assignment in sctp_init_cause.
[NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value
[NETFILTER]: nf_nat: fix hanging connections when loading the NAT module
[NETFILTER]: arp_tables: fix userspace compilation
[NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index f0bbe36799cf..167d888d1df2 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
| @@ -124,8 +124,8 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, | |||
| 124 | padlen = len % 4; | 124 | padlen = len % 4; |
| 125 | err.length = htons(len); | 125 | err.length = htons(len); |
| 126 | len += padlen; | 126 | len += padlen; |
| 127 | sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); | 127 | chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); |
| 128 | chunk->subh.err_hdr = sctp_addto_chunk(chunk, paylen, payload); | 128 | sctp_addto_chunk(chunk, paylen, payload); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | /* 3.3.2 Initiation (INIT) (1) | 131 | /* 3.3.2 Initiation (INIT) (1) |