22da317629bad23816f3fa26d657fb46e7af21c7 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/d4ac2477fad0f2680e84ec12e387ce67682c5c13 d4ac2477fad0f2680e84ec12e387ce67682c5c13 2007-08-03T19:49:55-07:00 2007-08-03T19:49:55-07:00 Linux 2.6.23-rc2 909c767ffc1b6e4413357e6b069e834efab19955 Linus Torvalds torvalds@woody.linux-foundation.org 3e847423bf029c2170692c75580a856debed617b 67439b76f29cb278bb3412fc873b980fc65110c9 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/22da317629bad23816f3fa26d657fb46e7af21c7 22da317629bad23816f3fa26d657fb46e7af21c7 2007-08-03T15:16:33-07:00 2007-08-03T15:16:33-07:00 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fixes for the SLB shadow buffer code [POWERPC] Fix a compile warning in powermac/feature.c [POWERPC] Fix a compile warning in pci_32.c [POWERPC] Fix parse_drconf_memory() for 64-bit start addresses [POWERPC] Fix num_cpus calculation in smp_call_function_map() [POWERPC] ps3: Fix section mismatch in ps3/setup.c [POWERPC] spufs: Fix affinity after introduction of node_allowed() calls [POWERPC] Fix special PTE code for secondary hash bucket [POWERPC] Expand RPN field to 34 bits when using 64k pages ea9e97afd3aca46c16b77468ef91e5e39d36ed7f Linus Torvalds torvalds@woody.linux-foundation.org c73d83473e47415e943c398e6612f65f6da5b3c9 Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/3e847423bf029c2170692c75580a856debed617b 3e847423bf029c2170692c75580a856debed617b 2007-08-03T15:10:44-07:00 2007-08-02T11:21:30-07:00 fix s2io regression * wrong argument passed to pci_unmap_single() on failure exit paths * leak in the same area Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> a15dd1eb342470a4acd0376a38574b6b25dfd56c Linus Torvalds torvalds@woody.linux-foundation.org 195be1c2086929efe1ca315e23f031f06e086369 bec494775600b1cd7c144d31a09e1f46df9c6324 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/c73d83473e47415e943c398e6612f65f6da5b3c9 c73d83473e47415e943c398e6612f65f6da5b3c9 2007-08-03T15:08:55-07:00 2007-08-03T15:08:55-07:00 Merge git://git.infradead.org/~dwmw2/mtd-2.6.23 * git://git.infradead.org/~dwmw2/mtd-2.6.23: [MTD] Makefile fix for mtdsuper 136d981df718d8c2f45eba6bf50bd15ecb3efaf2 Linus Torvalds torvalds@woody.linux-foundation.org 34bac238cc13cdb57f3b353b6e5ed3eae2cff158 a1da5f4f1beb8cae83104a65f36afe527184a4ef Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/195be1c2086929efe1ca315e23f031f06e086369 195be1c2086929efe1ca315e23f031f06e086369 2007-08-03T15:08:30-07:00 2007-08-03T15:08:30-07:00 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: Don't compile the PMU power driver on 64-bit PowerPC cc3b8d03b6c668a61077c761e1acc66943f2427b Linus Torvalds torvalds@woody.linux-foundation.org 247284481ca40288bd120cf0707681c3bdbee78f cc6f33db30c4fcf7915270619e81a91d6190b6c8 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/34bac238cc13cdb57f3b353b6e5ed3eae2cff158 34bac238cc13cdb57f3b353b6e5ed3eae2cff158 2007-08-03T15:07:10-07:00 2007-08-03T15:07:10-07:00 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23: sh: fix defconfigs for sh7751r boards sh: fix cf support on r2d boards sh: update r2d defconfig sh: update snapgear defconfig. sh: Fix SH-X3 FPU exception handling. sh: Fix pgd mismatch from cached TTB in unhandled fault. sh: Don't include fault-nommu on SH-2/SH-2A. sh: Fix irqflags tracing for SH-3/4 nommu. sh: Fix lockdep debugging oops on SH-3/4. 3fff52deec8671a5599bde9e711f166a7c92d693 Linus Torvalds torvalds@woody.linux-foundation.org b6b1d87785712474d0ed80689c17107d616a1171 Oleg Nesterov oleg@tv-sign.ru http://github.com/github/linux-2.6/commit/247284481ca40288bd120cf0707681c3bdbee78f 247284481ca40288bd120cf0707681c3bdbee78f 2007-08-03T15:06:33-07:00 2007-08-03T14:04:41-07:00 Kill some obsolete sub-thread-ptrace stuff There is a couple of subtle checks which were needed to handle ptracing from the same thread group. This was deprecated a long ago, imho this code just complicates the understanding. And, the "->parent->signal->flags & SIGNAL_GROUP_EXIT" check in exit_notify() is not right. SIGNAL_GROUP_EXIT can mean exec(), not exit_group(). This means ptracer can lose a ptraced zombie on exec(). Minor problem, but still the bug. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> d0de3020d9961561b66b44af8ddc9e4d1442a7fe Linus Torvalds torvalds@woody.linux-foundation.org 1a3f2ea336b784d7df750a7821f514f3dea69e29 Daniel Ritz daniel.ritz-ml@swissonline.ch http://github.com/github/linux-2.6/commit/b6b1d87785712474d0ed80689c17107d616a1171 b6b1d87785712474d0ed80689c17107d616a1171 2007-08-03T15:02:56-07:00 2007-08-03T07:07:43-07:00 serial: fix 8250 early console setup the early setup function serial8250_console_early_setup() can be called from non __init code (eg. hotpluggable serial ports like serial_cs) so remove the __init from the call chain to avoid crashes. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Cc: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> c0c1d90a82c58950db96456a9cfe2d8ad0b8d426 Linus Torvalds torvalds@woody.linux-foundation.org e1d7e7fcf8625857de6b48975096c127e5cb1534 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/1a3f2ea336b784d7df750a7821f514f3dea69e29 1a3f2ea336b784d7df750a7821f514f3dea69e29 2007-08-03T14:58:08-07:00 2007-08-03T14:58:08-07:00 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Fix O_CLOEXEC values. [SPARC32]: Fix modular build of floppy driver. [SOUND] CS4231 SBus: Two fixes. [CG6]: fix memory size detection [SPARC64]: Add missing dma_sync_single_range_for_*(). b7c2f5c7cc841d9f7b38fbdf03219b80dba97ea2 Linus Torvalds torvalds@woody.linux-foundation.org 3ff42e4f13095f5351fe651b8a591e67aabbb1a6 49ff4bb4cd4c04acf8f9e3d3ec2148305a1db445 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/e1d7e7fcf8625857de6b48975096c127e5cb1534 e1d7e7fcf8625857de6b48975096c127e5cb1534 2007-08-03T14:57:41-07:00 2007-08-03T14:57:41-07:00 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: DSACK signals data receival, be conservative [TCP]: Also handle snd_una changes in tcp_cwnd_down [TIPC]: Fix two minor sparse warnings. [TIPC]: Make function tipc_nameseq_subscribe static. [PF_KEY]: Fix ipsec not working in 2.6.23-rc1-git10 [TCP]: Invoke tcp_sendmsg() directly, do not use inet_sendmsg(). [IPV4] route.c: mostly kmalloc + memset conversion to k[cz]alloc [IPV4] raw.c: kmalloc + memset conversion to kzalloc [NETFILTER] nf_conntrack_l3proto_ipv4_compat.c: kmalloc + memset conversion to kzalloc [NETFILTER] nf_conntrack_expect.c: kmalloc + memset conversion to kzalloc [NET]: Removal of duplicated include net/wanrouter/wanmain.c SCTP: remove useless code in function sctp_init_cause SCTP: drop SACK if ctsn is not less than the next tsn of assoc SCTP: IPv4 mapped addr not returned in SCTPv6 accept() SCTP: IPv4 mapped addr not returned in SCTPv6 accept() sctp: fix shadow symbol in net/sctp/tsnmap.c sctp: try to fix readlock sctp: remove shadowed symbols sctp: move global declaration to header file. sctp: make locally used function static 50cea917139bb677b3e7492e162d0048936e6848 Linus Torvalds torvalds@woody.linux-foundation.org 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 ae57988f68acdc9fbee649765148f15eb7a1b991 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/3ff42e4f13095f5351fe651b8a591e67aabbb1a6 3ff42e4f13095f5351fe651b8a591e67aabbb1a6 2007-08-03T14:47:07-07:00 2007-08-03T14:47:07-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fw-core: make two variables static firewire: fw-ohci: dma_free_coherent needs IRQs enabled firewire: fw-sbp2: set correct maximum payload (fixes CardBus adapters) ieee1394: sbp2: more correct Kconfig dependencies ieee1394: revert "sbp2: enforce 32bit DMA mapping" f79324e46352fcd5de2634b188fc3fc0a71dbf27 Linus Torvalds torvalds@woody.linux-foundation.org 0a808a3131b2a6656475d82219f5e5d25edd7160 David S. Miller davem@sunset.davemloft.net http://github.com/github/linux-2.6/commit/6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b 2007-08-03T14:24:17-07:00 2007-08-03T14:24:17-07:00 [SPARC]: Fix O_CLOEXEC values. The one choosen by asm-generic/fcntl.h is not appropriate for this platform. Noticed by Ulrich Drepper. Signed-off-by: David S. Miller <davem@davemloft.net> 9d181e6d05283ab7e50d588748e94a5d65ecd912 David S. Miller davem@sunset.davemloft.net 3daadf33013a1c4d7abf4a65b24644cdd8ae896a David S. Miller davem@sunset.davemloft.net http://github.com/github/linux-2.6/commit/0a808a3131b2a6656475d82219f5e5d25edd7160 0a808a3131b2a6656475d82219f5e5d25edd7160 2007-08-03T14:08:42-07:00 2007-08-02T00:19:14-07:00 [SPARC32]: Fix modular build of floppy driver. Signed-off-by: David S. Miller <davem@davemloft.net> 12a4f0690bf01ccc9956ba974dd64237ee9f807c David S. Miller davem@sunset.davemloft.net 3fc701d5d459f3b83ba874613048d36e91debca2 Georg Chini georg.chini@triaton-webhosting.com http://github.com/github/linux-2.6/commit/3daadf33013a1c4d7abf4a65b24644cdd8ae896a 3daadf33013a1c4d7abf4a65b24644cdd8ae896a 2007-08-03T14:08:33-07:00 2007-08-01T21:55:58-07:00 [SOUND] CS4231 SBus: Two fixes. Remove unnecessary sbus_dma_reset function and change sbus_dma_enable to avoid occasional system crashes when stopping recording. Signed-off-by: Georg Chini <georg.chini@triaton-webhosting.com> Signed-off-by: David S. Miller <davem@davemloft.net> 807e1e2d951f0a36f1704eb7450bc1b09b42b4d5 David S. Miller davem@sunset.davemloft.net 63213196fd4b05b9c3539cbe34775c60f1f6fad0 Krzysztof Helt krzysztof.h1@wp.pl http://github.com/github/linux-2.6/commit/3fc701d5d459f3b83ba874613048d36e91debca2 3fc701d5d459f3b83ba874613048d36e91debca2 2007-08-03T14:08:26-07:00 2007-08-01T21:39:32-07:00 [CG6]: fix memory size detection This patch fixes memory size detection on the CG6 card. The 1MB TGX card has dblbuf property set to 0. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: David S. Miller <davem@davemloft.net> 48e91adb1a6364cc62d716a0e46be8da8c39bf72 David S. Miller davem@sunset.davemloft.net 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 David S. Miller davem@sunset.davemloft.net http://github.com/github/linux-2.6/commit/63213196fd4b05b9c3539cbe34775c60f1f6fad0 63213196fd4b05b9c3539cbe34775c60f1f6fad0 2007-08-03T14:08:20-07:00 2007-07-31T20:43:17-07:00 [SPARC64]: Add missing dma_sync_single_range_for_*(). Reported by Andrew Morton. Signed-off-by: David S. Miller <davem@davemloft.net> 86f038d75f42693865ab3d81fa3942f2d0b615eb David S. Miller davem@sunset.davemloft.net 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 Satyam Sharma satyam@infradead.org http://github.com/github/linux-2.6/commit/bec494775600b1cd7c144d31a09e1f46df9c6324 bec494775600b1cd7c144d31a09e1f46df9c6324 2007-08-03T04:42:40-07:00 2007-08-02T19:57:13-07:00 [MTD] Makefile fix for mtdsuper We want drivers/mtd/{mtdcore, mtdsuper, mtdpart}.c to be built and linked into the same mtd.ko module. Fix the Makefile to ensure this, and remove duplicate MODULE_ declarations in mtdpart.c, as mtdcore.c already has them. Signed-off-by: Satyam Sharma <satyam@infradead.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> 00f7a7ac88ab2d2d46ef0d00aa9b58c27eb7a246 David Woodhouse dwmw2@infradead.org 5628244059976009151d41c2798855290753d8d5 Michael Neuling mikey@neuling.org http://github.com/github/linux-2.6/commit/67439b76f29cb278bb3412fc873b980fc65110c9 67439b76f29cb278bb3412fc873b980fc65110c9 2007-08-03T02:36:01-07:00 2007-08-02T18:55:39-07:00 [POWERPC] Fixes for the SLB shadow buffer code On a machine with hardware 64kB pages and a kernel configured for a 64kB base page size, we need to change the vmalloc segment from 64kB pages to 4kB pages if some driver creates a non-cacheable mapping in the vmalloc area. However, we never updated with SLB shadow buffer. This fixes it. Thanks to paulus for finding this. Also added some write barriers to ensure the shadow buffer contents are always consistent. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org> d70c627453d429f63c777769f5596184c001fe39 Paul Mackerras paulus@samba.org 3a77d291be53fbc619f14a6199b9b4cac036c476 Segher Boessenkool segher@kernel.crashing.org http://github.com/github/linux-2.6/commit/5628244059976009151d41c2798855290753d8d5 5628244059976009151d41c2798855290753d8d5 2007-08-03T02:36:01-07:00 2007-08-01T08:41:14-07:00 [POWERPC] Fix a compile warning in powermac/feature.c ...by using the pci_get API instead of the deprecated old stuff. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org> ec7132190a3518ecd7cd335b5f297b90c7ea99c2 Paul Mackerras paulus@samba.org b9c3fdb0f0fe02ba33e87ef947f23cd12e6196fe Segher Boessenkool segher@kernel.crashing.org http://github.com/github/linux-2.6/commit/3a77d291be53fbc619f14a6199b9b4cac036c476 3a77d291be53fbc619f14a6199b9b4cac036c476 2007-08-03T02:36:01-07:00 2007-08-01T08:41:13-07:00 [POWERPC] Fix a compile warning in pci_32.c __must_check, so do so. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org> fbbdfaf0de61440bbf0707084537ddf5f62e3c4b Paul Mackerras paulus@samba.org 17aa3a82aa2173a22405f862c4444656f0494a3f Michael Ellerman michael@ellerman.id.au http://github.com/github/linux-2.6/commit/b9c3fdb0f0fe02ba33e87ef947f23cd12e6196fe b9c3fdb0f0fe02ba33e87ef947f23cd12e6196fe 2007-08-03T02:36:00-07:00 2007-07-31T18:34:38-07:00 [POWERPC] Fix parse_drconf_memory() for 64-bit start addresses Some new machines use the "ibm,dynamic-reconfiguration-memory" property to provide memory layout information, rather than via memory nodes. There is a bug in the code to parse this property for start addresses over 4GB; we store the start address in an unsigned int, which means we throw away the high bits and add apparently duplicate regions. This results in a BUG() in free_bootmem_core(). This fixes it by using an unsigned long instead. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org> 9838d0b84de9cf851aa43e05e81dbbf95db0156f Paul Mackerras paulus@samba.org cba684f56d7e8b82b08d4372375a42d6ebeab47d Kevin Corry kevcorry@us.ibm.com http://github.com/github/linux-2.6/commit/17aa3a82aa2173a22405f862c4444656f0494a3f 17aa3a82aa2173a22405f862c4444656f0494a3f 2007-08-03T02:36:00-07:00 2007-07-31T13:19:46-07:00 [POWERPC] Fix num_cpus calculation in smp_call_function_map() In smp_call_function_map(), num_cpus is set to the number of online CPUs minus one. However, if the CPU mask does not include all CPUs (except the one we're running on), the routine will hang in the first while() loop until the 8 second timeout occurs. The num_cpus should be set to the number of CPUs specified in the mask passed into the routine, after we've made any modifications to the mask. With this change, we can also get rid of the call to cpus_empty() and avoid adding another pass through the bitmask. Signed-off-by: Kevin Corry <kevcorry@us.ibm.com> Signed-off-by: Carl Love <carll@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> f721aec8c56ce1d45958b80bc59d661e1ad5745b Paul Mackerras paulus@samba.org 683e3ab2b54a7190ec8517705880171cc8ac1d92 Stephen Rothwell sfr@canb.auug.org.au http://github.com/github/linux-2.6/commit/cba684f56d7e8b82b08d4372375a42d6ebeab47d cba684f56d7e8b82b08d4372375a42d6ebeab47d 2007-08-03T02:36:00-07:00 2007-07-31T00:22:00-07:00 [POWERPC] ps3: Fix section mismatch in ps3/setup.c WARNING: vmlinux.o(.text+0x605d4): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.prealloc' and '.ps3_power_save') Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org> 65131d8f165d3373b6d797dc6863fa7174db7d9a Paul Mackerras paulus@samba.org 430404ed9c2f202ca9d3c8072699b2b0279e4dfe Andre Detsch adetsch@br.ibm.com http://github.com/github/linux-2.6/commit/683e3ab2b54a7190ec8517705880171cc8ac1d92 683e3ab2b54a7190ec8517705880171cc8ac1d92 2007-08-03T02:18:10-07:00 2007-07-30T16:48:11-07:00 [POWERPC] spufs: Fix affinity after introduction of node_allowed() calls This patch fixes affinity reference point placement, which was not being done in some situations, after the introduction of node_allowed() calls. The previously used parameter, 'ctx', is just the iterator of the previous list_for_each_entry_reverse loop, and its value might be invalid at the end of the loop. Also, the right context to seek for information when defining the reference ctx location _is_ the reference ctx. Signed-off-by: Andre Detsch <adetsch@br.ibm.com> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org> 5afc17507c394c0597d4ddb672d4b9886e09e665 Paul Mackerras paulus@samba.org c0f7c6cb5dbb6d90e0334e62376dbc6ac3d1d315 Paul Mackerras paulus@samba.org http://github.com/github/linux-2.6/commit/430404ed9c2f202ca9d3c8072699b2b0279e4dfe 430404ed9c2f202ca9d3c8072699b2b0279e4dfe 2007-08-03T02:16:11-07:00 2007-08-03T02:16:11-07:00 [POWERPC] Fix special PTE code for secondary hash bucket The code for mapping special 4k pages on kernels using a 64kB base page size was missing the code for doing the RPN (real page number) manipulation when inserting the hardware PTE in the secondary hash bucket. It needs the same code as has already been added to the code that inserts the HPTE in the primary hash bucket. This adds it. Spotted by Ben Herrenschmidt. Signed-off-by: Paul Mackerras <paulus@samba.org> d9e8d70d3daf2f04e7dc76b2d774964bae060804 Paul Mackerras paulus@samba.org 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 Paul Mackerras paulus@samba.org http://github.com/github/linux-2.6/commit/c0f7c6cb5dbb6d90e0334e62376dbc6ac3d1d315 c0f7c6cb5dbb6d90e0334e62376dbc6ac3d1d315 2007-08-02T21:08:24-07:00 2007-08-02T21:08:24-07:00 [POWERPC] Expand RPN field to 34 bits when using 64k pages The real page number field in our PTEs when configured for 64kB pages is currently 32 bits, which turns out to be not quite enough for the resources that the eHCA driver wants to map. This expands the RPN field to include 2 adjacent, previously-unused bits. Signed-off-by: Paul Mackerras <paulus@samba.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> 37c6d023d743a1bcf23f3caa28fae08310ef30a9 Paul Mackerras paulus@samba.org 2e6052941ae1f2f875d7d9092acb8836af1e0193 Ilpo Järvinen ilpo.jarvinen@helsinki.fi http://github.com/github/linux-2.6/commit/49ff4bb4cd4c04acf8f9e3d3ec2148305a1db445 49ff4bb4cd4c04acf8f9e3d3ec2148305a1db445 2007-08-02T19:47:59-07:00 2007-08-02T19:47:59-07:00 [TCP]: DSACK signals data receival, be conservative In case a DSACK is received, it's better to lower cwnd as it's a sign of data receival. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> 3e443a0cf902c02d8046617c24700745a1afecd0 David S. Miller davem@davemloft.net 3a97aeb5c199070f136c085f8b0f9338d19c4148 Ilpo Järvinen ilpo.jarvinen@helsinki.fi http://github.com/github/linux-2.6/commit/2e6052941ae1f2f875d7d9092acb8836af1e0193 2e6052941ae1f2f875d7d9092acb8836af1e0193 2007-08-02T19:46:58-07:00 2007-08-02T19:46:58-07:00 [TCP]: Also handle snd_una changes in tcp_cwnd_down tcp_cwnd_down must check for it too as it should be conservative in case of collapse stuff and also when receiver is trying to lie (though that wouldn't be very successful/useful anyway). Note: - Separated also is_dupack and do_lost in fast_retransalert * Much cleaner look-and-feel now * This time it really fixes cumulative ACK with many new SACK blocks recovery entry (I claimed this fixes with last patch but it wasn't). TCP will now call tcp_update_scoreboard regardless of is_dupack when in recovery as long as there is enough fackets_out. - Introduce FLAG_SND_UNA_ADVANCED * Some prior_snd_una arguments are unnecessary after it - Added helper FLAG_ANY_PROGRESS to avoid long FLAG...|FLAG... constructs Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> ade0bd7235403397b6165a5a2e788dd739912d94 David S. Miller davem@davemloft.net d788d8056fd913defa48bd94f18dc53de98cd7a6 5f8f1c3c87e44f1bd0180cf19d0e7c83d062b4dc David S. Miller davem@sunset.davemloft.net http://github.com/github/linux-2.6/commit/3a97aeb5c199070f136c085f8b0f9338d19c4148 3a97aeb5c199070f136c085f8b0f9338d19c4148 2007-08-02T19:44:43-07:00 2007-08-02T19:44:43-07:00 Merge davem@master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev 49cfc0939119a8a6db73c5522bc56902cbe4a8f6 David S. Miller davem@sunset.davemloft.net 248bbf38215fd5ce45a31c65c5e5511d9b611e5a Florian Westphal fw@strlen.de http://github.com/github/linux-2.6/commit/d788d8056fd913defa48bd94f18dc53de98cd7a6 d788d8056fd913defa48bd94f18dc53de98cd7a6 2007-08-02T19:42:31-07:00 2007-08-02T19:28:06-07:00 [TIPC]: Fix two minor sparse warnings. fix two warnings generated by sparse: link.c:2386 symbol 'msgcount' shadows an earlier one node.c:244 symbol 'addr_string' shadows an earlier one Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net> 139588307f7706579c39541343f8fb77af895b35 David S. Miller davem@sunset.davemloft.net