forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-next' into for-linus

Browse source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina 2009-12-07 18:36:35 +01:00
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/sctp/sm_statefuns.c
View file

@ -3572,7 +3572,7 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep,
* To do this properly, we'll set the destination address of the chunk
* and at the transmit time, will try look up the transport to use.
* Since ASCONFs may be bundled, the correct transport may not be
* created untill we process the entire packet, thus this workaround.
* created until we process the entire packet, thus this workaround.
*/
asconf_ack->dest = chunk->source;
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack));