diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /net/sctp/associola.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'net/sctp/associola.c')
| -rw-r--r-- | net/sctp/associola.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 6b04287913c..0698cad6176 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -1593,7 +1593,7 @@ void sctp_assoc_clean_asconf_ack_cache(const struct sctp_association *asoc) | |||
| 1593 | struct sctp_chunk *ack; | 1593 | struct sctp_chunk *ack; |
| 1594 | struct sctp_chunk *tmp; | 1594 | struct sctp_chunk *tmp; |
| 1595 | 1595 | ||
| 1596 | /* We can remove all the entries from the queue upto | 1596 | /* We can remove all the entries from the queue up to |
| 1597 | * the "Peer-Sequence-Number". | 1597 | * the "Peer-Sequence-Number". |
| 1598 | */ | 1598 | */ |
| 1599 | list_for_each_entry_safe(ack, tmp, &asoc->asconf_ack_list, | 1599 | list_for_each_entry_safe(ack, tmp, &asoc->asconf_ack_list, |