diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-09 01:30:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-09 01:30:17 +0200 |
| commit | 7c3ceb4a409e2b838700edf081d61a8a4c921e79 (patch) | |
| tree | 4dbf54cc23d2796b278e22fc6f5460b9b451c956 /net/sctp/ulpevent.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| parent | ipv6: fix race between ipv6_del_addr and DAD timer (diff) | |
| download | linux-7c3ceb4a409e2b838700edf081d61a8a4c921e79.tar.xz linux-7c3ceb4a409e2b838700edf081d61a8a4c921e79.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.c
net/mac80211/mlme.c
Diffstat (limited to 'net/sctp/ulpevent.c')
| -rw-r--r-- | net/sctp/ulpevent.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c index ce6cda6b6994..a1f654aea268 100644 --- a/net/sctp/ulpevent.c +++ b/net/sctp/ulpevent.c @@ -710,6 +710,11 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc, if (!skb) goto fail; + /* Now that all memory allocations for this chunk succeeded, we + * can mark it as received so the tsn_map is updated correctly. + */ + sctp_tsnmap_mark(&asoc->peer.tsn_map, ntohl(chunk->subh.data_hdr->tsn)); + /* First calculate the padding, so we don't inadvertently * pass up the wrong length to the user. * |