diff options
| author | James Bottomley <[email protected]> | 2006-09-24 02:03:52 +0000 |
|---|---|---|
| committer | James Bottomley <[email protected]> | 2006-09-24 02:03:52 +0000 |
| commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
| tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /net/sctp/inqueue.c | |
| parent | [SCSI] SPI transport class: misc DV fixes (diff) | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| download | kernel-1aedf2ccc60fade26c46fae12e28664d0da3f199.tar.gz kernel-1aedf2ccc60fade26c46fae12e28664d0da3f199.zip | |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'net/sctp/inqueue.c')
| -rw-r--r-- | net/sctp/inqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c index cf0c767d43ae..cf6deed7e849 100644 --- a/net/sctp/inqueue.c +++ b/net/sctp/inqueue.c @@ -87,7 +87,7 @@ void sctp_inq_free(struct sctp_inq *queue) /* Put a new packet in an SCTP inqueue. * We assume that packet->sctp_hdr is set and in host byte order. */ -void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *packet) +void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *chunk) { /* Directly call the packet handling routine. */ @@ -96,7 +96,7 @@ void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *packet) * Eventually, we should clean up inqueue to not rely * on the BH related data structures. */ - list_add_tail(&packet->list, &q->in_chunk_list); + list_add_tail(&chunk->list, &q->in_chunk_list); q->immediate.func(q->immediate.data); } |