diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:46:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:46:27 -0400 |
| commit | a3b5960ebd660c9ab92fce9a01d1905ff9b981cb (patch) | |
| tree | f636ecb2ff88ae724243445b6eef2e6b2d773200 /net/dccp/ackvec.c | |
| parent | 37b0d1dedcedf555e2940bc7702c11e2b572299f (diff) | |
| parent | 42d1d52e695d87475846e9a09964cae1209eeecb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: Increment ipInHdrErrors when TTL expires.
[TCP]: continued: reno sacked_out count fix
[DCCP] Ackvec: fix soft lockup in ackvec handling code
Diffstat (limited to 'net/dccp/ackvec.c')
| -rw-r--r-- | net/dccp/ackvec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index b5981e5f6b00..8c211c58893b 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c | |||
| @@ -452,6 +452,7 @@ found: | |||
| 452 | (unsigned long long) | 452 | (unsigned long long) |
| 453 | avr->dccpavr_ack_ackno); | 453 | avr->dccpavr_ack_ackno); |
| 454 | dccp_ackvec_throw_record(av, avr); | 454 | dccp_ackvec_throw_record(av, avr); |
| 455 | break; | ||
| 455 | } | 456 | } |
| 456 | /* | 457 | /* |
| 457 | * If it wasn't received, continue scanning... we might | 458 | * If it wasn't received, continue scanning... we might |