diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:19:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:19:26 -0800 |
commit | 18a4144028f056b77d6576d4eb284246e9c7ea97 (patch) | |
tree | 85277bf6b49982753d762d58a14aa642e79c037e /net/sctp/inqueue.c | |
parent | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (diff) | |
parent | 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a (diff) | |
download | linux-18a4144028f056b77d6576d4eb284246e9c7ea97.tar.gz linux-18a4144028f056b77d6576d4eb284246e9c7ea97.tar.bz2 linux-18a4144028f056b77d6576d4eb284246e9c7ea97.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/inqueue.c')
-rw-r--r-- | net/sctp/inqueue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c index 2d33922c044b..297b8951463e 100644 --- a/net/sctp/inqueue.c +++ b/net/sctp/inqueue.c @@ -73,8 +73,10 @@ void sctp_inq_free(struct sctp_inq *queue) /* If there is a packet which is currently being worked on, * free it as well. */ - if (queue->in_progress) + if (queue->in_progress) { sctp_chunk_free(queue->in_progress); + queue->in_progress = NULL; + } if (queue->malloced) { /* Dump the master memory segment. */ |