commit aac372de6bde03168b833b4db1346a2c34a016c6 tree 2f8e0f92f5384e58169ac4ddd452b9e7e5b05435 parent 02d31ed258434b29eb0e3a10f5ede6eecd46b6ba parent c9c10830740df1b5e7848d6fbb68c93a73e8f7cd author Linus Torvalds Wed, 12 Oct 2005 19:08:10 -0700 committer Linus Torvalds Wed, 12 Oct 2005 19:08:10 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 02d31ed258434b29eb0e3a10f5ede6eecd46b6ba tree e901ed8af00756086e2da1a5e0c52602d2b01603 parent 1b66e9fe8523cc239b6bea8443a860f50aeb2a83 parent 9ff5c59ce278c37bca22fbf98076d199bcaf9845 author Linus Torvalds Wed, 12 Oct 2005 19:07:59 -0700 committer Linus Torvalds Wed, 12 Oct 2005 19:07:59 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 1b66e9fe8523cc239b6bea8443a860f50aeb2a83 tree 7d067a24df07dc1116c7c636dc41f77ab874f167 parent 67d2b48e20bfc82f8fdb5410c28564b8b058fcab parent 9621904012de3c8d0d4e2904dcc7170b3012119e author Linus Torvalds Wed, 12 Oct 2005 19:07:38 -0700 committer Linus Torvalds Wed, 12 Oct 2005 19:07:38 -0700 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 67d2b48e20bfc82f8fdb5410c28564b8b058fcab tree e7f6c54ee8d29893af37dc089a25a7ab24876b05 parent d8e998c58a870770905495a1d45ebf7285b5b1c5 parent 875521ddccfa90d519cf31dfc8aa472f7f6325bb author Linus Torvalds Wed, 12 Oct 2005 19:07:19 -0700 committer Linus Torvalds Wed, 12 Oct 2005 19:07:19 -0700 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 9ff5c59ce278c37bca22fbf98076d199bcaf9845 tree eadd2da5cdf0cbe158c55567684385f6db86394f parent afb997c6163b33292d31a09d6aa5cbb03ffa5bf1 author Herbert Xu Wed, 12 Oct 2005 15:59:39 -0700 committer David S. Miller Wed, 12 Oct 2005 15:59:39 -0700 [TCP]: Add code to help track down "BUG at net/ipv4/tcp_output.c:438!" This is the second report of this bug. Unfortunately the first reporter hasn't been able to reproduce it since to provide more debugging info. So let's apply this patch for 2.6.14 to 1) Make this non-fatal. 2) Provide the info we need to track it down. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit afb997c6163b33292d31a09d6aa5cbb03ffa5bf1 tree ee88c284b220e60088934b77797f4433590bf90c parent ab4060e858e36129f9319ef0fa055347ad60e1d5 author Ben Dooks Wed, 12 Oct 2005 15:12:21 -0700 committer David S. Miller Wed, 12 Oct 2005 15:12:21 -0700 [NETPOLL]: wrong return for null netpoll_poll_lock() When netpoll is not being used, the macro that defines the removed routing netpoll_poll_lock defines the return as zero, but the real routine returns a `void *` Signed-off-by: Ben Dooks Signed-off-by: David S. Miller commit ab4060e858e36129f9319ef0fa055347ad60e1d5 tree c3d28036801fcab8529bd8ee977fafd755fb3da4 parent eeb2b8560676e454ad37ee30b49bc7d897edc9be author Stephen Hemminger Wed, 12 Oct 2005 15:10:01 -0700 committer David S. Miller Wed, 12 Oct 2005 15:10:01 -0700 [BRIDGE]: fix race on bridge del if This fixes the RCU race on bridge delete interface. Basically, the network device has to be detached from the bridge in the first step (pre-RCU), rather than later. At that point, no more bridge traffic will come in, and the other code will not think that network device is part of a bridge. This should also fix the XEN test problems. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c9c10830740df1b5e7848d6fbb68c93a73e8f7cd tree b614058c3291ebccb996b27cee9b709956df7791 parent d8e998c58a870770905495a1d45ebf7285b5b1c5 author David S. Miller Wed, 12 Oct 2005 12:22:46 -0700 committer David S. Miller Wed, 12 Oct 2005 12:22:46 -0700 [SPARC64]: Fix boot failures on SunBlade-150 The sequence to move over to the Linux trap tables from the firmware ones needs to be more air tight. It turns out that to be %100 safe we do need to be able to translate OBP mappings in our TLB miss handlers early. In order not to eat up a lot of kernel image memory with static page tables, just use the translations array in the OBP TLB miss handlers. That solves the bulk of the problem. Furthermore, to make sure the OBP TLB miss path will work even before the fixed MMU globals are loaded, explicitly load %g1 to TLB_SFSR at the beginning of the i-TLB and d-TLB miss handlers. To ease the OBP TLB miss walking of the prom_trans[] array, we sort it then delete all of the non-OBP entries in there (for example, there are entries for the kernel image itself which we're not interested in at all). We also save about 32K of kernel image size with this change. Not a bad side effect :-) There are still some reasons why trampoline.S can't use the setup_trap_table() yet. The most noteworthy are: 1) OBP boots secondary processors with non-bias'd stack for some reason. This is easily fixed by using a small bootup stack in the kernel image explicitly for this purpose. 2) Doing a firmware call via the normal C call prom_set_trap_table() goes through the whole OBP enter/exit sequence that saves and restores OBP and Linux kernel state in the MMUs. This path unfortunately does a "flush %g6" while loading up the OBP locked TLB entries for the firmware call. If we setup the %g6 in the trampoline.S code properly, that is in the PAGE_OFFSET linear mapping, but we're not on the kernel trap table yet so those addresses won't translate properly. One idea is to do a by-hand firmware call like we do in the early bootup code and elsewhere here in trampoline.S But this fails as well, as aparently the secondary processors are not booted with OBP's special locked TLB entries loaded. These are necessary for the firwmare to processes TLB misses correctly up until the point where we take over the trap table. This does need to be resolved at some point. Signed-off-by: David S. Miller commit d8e998c58a870770905495a1d45ebf7285b5b1c5 tree 828a1633c667c0769feec6451aa450bbfb911a10 parent cbd27b8ced4b1888c93f69b4dd108a69ac4d733f author Benjamin Herrenschmidt Wed, 12 Oct 2005 14:22:50 +1000 committer Linus Torvalds Wed, 12 Oct 2005 08:24:47 -0700 [PATCH] ppc32: Tell userland about lack of standard TB Glibc is about to get some new high precision timer stuff that relies on the standard timebase of the PPC architecture. However, some (rare & old) CPUs do not have such timebase and it is a bit annoying to have your stuff just crash because you are running on the wrong CPU... This exposes to userland a CPU feature bit that tells that the current processor doesn't have a standard timebase. It's negative logic so that glibc will still "just work" on older kernels (it will just be unhappy on those old CPUs but that doesn't really matter as distro tend to update glibc & kernel at the same time). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit cbd27b8ced4b1888c93f69b4dd108a69ac4d733f tree c3bf062e9473261cbd4774996c96cfc0f3759239 parent 9d624ea474a3ddf3a0702d9b47e428ce1f8488a6 author Benjamin Herrenschmidt Wed, 12 Oct 2005 11:39:33 +1000 committer Linus Torvalds Wed, 12 Oct 2005 08:24:47 -0700 [PATCH] ppc32: Fix timekeeping Interestingly enough, ppc32 had broken timekeeping for ages... It worked, but probably drifted a bit more than could be explained by the actual bad precision of the timebase calibration. We discovered that recently when somebody figured out that the common code was using CLOCK_TICK_RATE to correct the timekeeing, and ppc32 had a completely bogus value for it. This patch turns it into something saner. Probably not as good as doing something based on the actual timebase frequency precision but I'll leave that sort of math to others. This at least makes it better for the common HZ values. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 9d624ea474a3ddf3a0702d9b47e428ce1f8488a6 tree 6974b966b5da06e04597fc32a3b67fe0a8e0bafc parent 91acb21f084aa244f26839406ae7ed8aa3668058 author Paolo 'Blaisorblade' Giarrusso Tue, 11 Oct 2005 21:01:01 +0200 committer Linus Torvalds Wed, 12 Oct 2005 08:22:26 -0700 [PATCH] uml: compile-time fix recent patch Give an empty definition for clear_can_do_skas() when it is not needed. Thanks to Junichi Uekawa for reporting the breakage and providing a fix (I re-fixed it in an IMHO cleaner way). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 91acb21f084aa244f26839406ae7ed8aa3668058 tree 5a186b9b35d2e26aaf1c85441125611c9c88dd18 parent da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 author Jeff Dike Mon, 10 Oct 2005 23:10:32 -0400 committer Linus Torvalds Wed, 12 Oct 2005 08:22:26 -0700 [PATCH] uml: revert block driver use of host AIO The patch to use host AIO support that I submitted early after 2.6.13 exposed some problems in the block driver. I have fixes for these, but am not comfortable putting them into 2.6.14 at this late date. So, this patch reverts the use of host AIO. I will resubmit the original patch, plus fixes to the driver after 2.6.14 in order to get a reasonable amount of testing before they're exposed to the general public. Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 tree c6f31816e5a5afc84e920c6c3f5702327dd990de parent f5154a98a1931641f0448f6512294a15279110d7 parent b1b510aa284af1908d5d369d52f7dae16aaabd71 author Linus Torvalds Tue, 11 Oct 2005 16:39:24 -0700 committer Linus Torvalds Tue, 11 Oct 2005 16:39:24 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit b1b510aa284af1908d5d369d52f7dae16aaabd71 tree dd79875667adf73552c4b9c4789aee2b4ada8368 parent 08eb8f124f990aa476589d1f7810f7ec7f259c08 author David S. Miller Tue, 11 Oct 2005 15:45:16 -0700 committer David S. Miller Tue, 11 Oct 2005 15:45:16 -0700 [SPARC64]: Fix net booting on Ultra5 We were not doing alignment properly when remapping the kernel image. What we want is a 4MB aligned physical address to map at KERNBASE. Mistakedly we were 4MB aligning the virtual address where the kernel initially sits, that's wrong. Instead, we should PAGE align the virtual address, then 4MB align the physical address result the prom gives to us. Signed-off-by: David S. Miller commit f5154a98a1931641f0448f6512294a15279110d7 tree fd5ea19514d07338f58b2df4b2f87922b9975a04 parent 9149ccfa3571eaa4a4b444777d67fc4ed3ebcf27 author Hugh Dickins Tue, 11 Oct 2005 19:16:26 +0100 committer Linus Torvalds Tue, 11 Oct 2005 12:03:47 -0700 [PATCH] Don't map the same page too much Refuse to install a page into a mapping if the mapping count is already ridiculously large. You probably cannot trigger this on 32-bit architectures, but on a 64-bit setup we should protect against it. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 9149ccfa3571eaa4a4b444777d67fc4ed3ebcf27 tree 92d07c8a2e76abf5b5805db6deb5a90d69406b76 parent d3089792f6ee38cdc9e254a7cb2f8c8d7f38c20d author Peter Bergner Tue, 11 Oct 2005 09:28:24 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] ppc64: Add R_PPC64_TOC16 module reloc Newer gcc's are generating this relocation, so the module loader needs to handle it. Signed-off-by: Peter Bergner Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3089792f6ee38cdc9e254a7cb2f8c8d7f38c20d tree f1a6e34bf02d5ebdfe5647e72286d74c2f45a720 parent 9de11aab1c8fd87da7e1fb435ce0ff26bacd7909 author Michael Krufky Tue, 11 Oct 2005 09:28:24 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] V4L: Enable s-video input on DViCO FusionHDTV5 Lite * bttv-cards.c: - Enable S-Video input on DViCO FusionHDTV5 Lite Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de11aab1c8fd87da7e1fb435ce0ff26bacd7909 tree 3ab41df3d9ba382278e819ab8d84be163b6dab9c parent 6de505173e24e76bb33a2595312e0c2b44d49e58 author Hirokazu Takata Tue, 11 Oct 2005 08:29:09 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] m32r: trap handler code for illegal traps This patch prevents illegal traps from causing m32r kernel's infinite loop execution. Signed-off-by: Naoto Sugai Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6de505173e24e76bb33a2595312e0c2b44d49e58 tree 0d06e061a70b337627b7e83985d736c0b4f50f33 parent a0c111c631e7ab4abd68920debd44259160812ef author akpm@osdl.org Tue, 11 Oct 2005 08:29:08 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] binfmt_elf bss padding fix Nir Tzachar points out that if an ELF file specifies a zero-length bss at a whacky address, we cannot load that binary because padzero() tries to zero out the end of the page at the whacky address, and that may not be writeable. See also http://bugzilla.kernel.org/show_bug.cgi?id=5411 So teach load_elf_binary() to skip the bss settng altogether if the elf file has a zero-length bss segment. Cc: Roland McGrath Cc: Daniel Jacobowitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0c111c631e7ab4abd68920debd44259160812ef tree bfcafa019ba2fb2bf38e5a07f9f5958b7ecb697f parent 1bef40032992320dd25a266fc166bfb8fa3f2f59 author Paolo Galtieri Tue, 11 Oct 2005 08:29:07 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] ppc highmem fix I've noticed that the calculations for seg_size and nr_segs in __dma_sync_page_highmem() (arch/ppc/kernel/dma-mapping.c) are wrong. The incorrect calculations can result in either an oops or a panic when running fsck depending on the size of the partition. The problem with the seg_size calculation is that it can result in a negative number if size is offset > size. The problem with the nr_segs caculation is returns the wrong number of segments, e.g. it returns 1 when size is 200 and offset is 4095, when it should return 2 or more. Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bef40032992320dd25a266fc166bfb8fa3f2f59 tree e02d654b4db45b752e3201c3f6eec3f4c719b69f parent 22c1ea44f0d33eda532883858b6cdabc5f265b66 author Suzuki Tue, 11 Oct 2005 08:29:06 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] madvise: Avoid returning error code -EBADF for anonymous mappings Revert this recent correctness change: Douglas Crosher reported that it broke an existing application, and that madvise() works without error on anonymous mappings on Solaris. This means that madvise() will remain non-standards-compliant: we should return -EBADF for all requests against non-file-backed vma's, but Linux only does this for MADV_WILLNEED requests. Signed-off-by: Suzuki K P Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22c1ea44f0d33eda532883858b6cdabc5f265b66 tree 8af9c20a09e9ce9d497ec3db078d872b74a9c3ab parent 19cba8abd6ca09527c194864ae651db65cbacfe1 author Andreas Gruenbacher Tue, 11 Oct 2005 08:29:05 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] nfsacl: Solaris VxFS compatibility fix Here is a compatibility fix between Linux and Solaris when used with VxFS filesystems: Solaris usually accepts acl entries in any order, but with VxFS it replies with NFSERR_INVAL when it sees a four-entry acl that is not in canonical form. It may also fail with other non-canonical acls -- I can't tell, because that case never triggers: We only send non-canonical acls when we fake up an ACL_MASK entry. Instead of adding fake ACL_MASK entries at the end, inserting them in the correct position makes Solaris+VxFS happy. The Linux client and server sides don't care about entry order. The three-entry-acl special case in which we need a fake ACL_MASK entry was handled in xdr_nfsace_encode. The patch moves this into nfsacl_encode. Signed-off-by: Andreas Gruenbacher Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19cba8abd6ca09527c194864ae651db65cbacfe1 tree 3d59a1e147b2701d0957bef392e2fda441d5143f parent ad6ce87e5bd4440a6ce9aa9f8cda795b9e902eff author Latchesar Ionkov Tue, 11 Oct 2005 08:29:03 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] v9fs: remove additional buffer allocation from v9fs_file_read and v9fs_file_write v9fs_file_read and v9fs_file_write use kmalloc to allocate buffers as big as the data buffer received as parameter. kmalloc cannot be used to allocate buffers bigger than 128K, so reading/writing data in chunks bigger than 128k fails. This patch reorganizes v9fs_file_read and v9fs_file_write to allocate only buffers as big as the maximum data that can be sent in one 9P message. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad6ce87e5bd4440a6ce9aa9f8cda795b9e902eff tree d3ea460d562a06ccfd1edec6e2b6c4e37995438a parent e4314bf496bb7bb9acd754aeb319c30869bc8d76 author Abhay Salunke Tue, 11 Oct 2005 08:29:02 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:53 -0700 [PATCH] dell_rbu: changes in packet update mechanism In the current dell_rbu code ver 2.0 the packet update mechanism makes the user app dump every individual packet in to the driver. This adds in efficiency as every packet update makes the /sys/class/firmware/dell_rbu/loading and data files to disappear and reappear again. Thus the user app needs to wait for the files to reappear to dump another packet. This slows down the packet update tremendously in case of large number of packets. I am submitting a new patch for dell_rbu which will change the way we do packet updates; In the new method the user app will create a new single file which has already packetized the rbu image and all the packets are now staged in this file. This driver also creates a new entry in /sys/devices/platform/dell_rbu/packet_size ; the user needs to echo the packet size here before downloading the packet file. The user should do the following: create one single file which has all the packets stacked together. echo the packet size in to /sys/devices/platform/dell_rbu/packet_size. echo 1 > /sys/class/firmware/dell_rbu/loading cat the packetfile > /sys/class/firmware/dell_rbu/data echo 0 > /sys/class/firmware/dell_rbu/loading The driver takes the file which came through /sys/class/firmware/dell_rbu/data and takes chunks of paket_size data from it and place in contiguous memory. This makes packet update process very efficient and fast. As all the packet update happens in one single operation. The user can still read back the downloaded file from /sys/devices/platform/dell_rbu/data. Signed-off-by: Abhay Salunke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4314bf496bb7bb9acd754aeb319c30869bc8d76 tree ecec8fb728b2f872f970a7d666aa0147654e809f parent e5945b4f605d1479d5b44252a2c691168c5d38d6 author Anton Blanchard Tue, 11 Oct 2005 08:29:00 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:53 -0700 [PATCH] ppc64: Fix PCI hotplug pSeries_irq_bus_setup is marked __devinit but references s7a_workaround which is marked __initdata. Depending on who got the memory for s7a_workaround (and if the value was now positive), it was possible for PCI hotplugged devices to have 3 subtracted from their interrupt number. This would happen randomly and caused me much confusion :) Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5945b4f605d1479d5b44252a2c691168c5d38d6 tree 042f1163012843113aecce2ccbb997e0d2622025 parent 907a42617970a159361f17ef9a63f04d276995ab author Cornelia Huck Tue, 11 Oct 2005 08:28:59 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:53 -0700 [PATCH] s390: ccw device reconnect oops. Search for a disconnect ccw_device on the ccw bus rather than on the css bus (was a typo in patch I did for the klist conversion). A cast to an embedding ccw_device from an embedded device in a struct subchannel will lead us to oopses. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9621904012de3c8d0d4e2904dcc7170b3012119e tree a4bf95c6f7b53bb626884ca7b68d6b5d63fa3b8f parent 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 author Jeff Garzik Tue, 11 Oct 2005 01:52:39 -0400 committer Jeff Garzik Tue, 11 Oct 2005 01:52:39 -0400 sata_nv: Fixed bug introduced by 0.08's MCP51 and MCP55 support. commit 875521ddccfa90d519cf31dfc8aa472f7f6325bb tree 5a337befd661bc5fbd16b26b9c73ee1f620054b0 parent 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 author Jeff Garzik Tue, 11 Oct 2005 01:38:35 -0400 committer Jeff Garzik Tue, 11 Oct 2005 01:38:35 -0400 e100: revert CPU cycle saver microcode, it causes severe problems for certain NICs Reverting 685fac63f5ca6c5ca06bab641e1a32bbf9287e89: > [PATCH] e100: CPU cycle saver microcode > > > Add cpu cycle saver microcode to 8086:{1209/1229} other than ICH devices. > > Signed-off-by: Mallikarjuna R Chilakala > Signed-off-by: Ganesh Venkatesan > Signed-off-by: John Ronciak > Signed-off-by: Jeff Garzik commit eeb2b8560676e454ad37ee30b49bc7d897edc9be tree 60b316e93b880aa1ba01a9c5496c8269a48b4de9 parent 2a9bc9bb4d3a4570a8a48aadf071b91e657adb89 author Arnaldo Carvalho de Melo Mon, 10 Oct 2005 21:25:23 -0700 committer David S. Miller Mon, 10 Oct 2005 21:25:23 -0700 [TWSK]: Grab the module refcount for timewait sockets This is required to avoid unloading a module that has active timewait sockets, such as DCCP. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2a9bc9bb4d3a4570a8a48aadf071b91e657adb89 tree b20dc78e5e9dc6deed61c47bf12a72ec8f9a9768 parent 777b25a2fea7129222eb11fba55c0a67982383ff author Arnaldo Carvalho de Melo Mon, 10 Oct 2005 21:25:00 -0700 committer David S. Miller Mon, 10 Oct 2005 21:25:00 -0700 [DCCP]: Transition from PARTOPEN to OPEN when receiving DATA packets Noticed by Andrea Bittau, that provided a patch that was modified to not transition from RESPOND to OPEN when receiving DATA packets. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 777b25a2fea7129222eb11fba55c0a67982383ff tree 51e4a429fc09a8401371e47db9845d119408e576 parent 061cb4a0ec34a6e3069d5a1b3c547e55a71498c5 author Arnaldo Carvalho de Melo Mon, 10 Oct 2005 21:24:20 -0700 committer David S. Miller Mon, 10 Oct 2005 21:24:20 -0700 [CCID]: Check if ccid is NULL in the hc_[tr]x_exit functions For consistency with ccid_exit and to fix a bug when IP_DCCP_UNLOAD_HACK is enabled as the control sock is not associated to any CCID. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 061cb4a0ec34a6e3069d5a1b3c547e55a71498c5 tree 016065254b56b7739cc26df7007d094651fb64d6 parent 339231537506846cb232a2f0cc4a2c662b2d5b07 author Pablo Neira Ayuso Mon, 10 Oct 2005 21:23:46 -0700 committer David S. Miller Mon, 10 Oct 2005 21:23:46 -0700 [NETFILTER] ctnetlink: add support to change protocol info This patch add support to change the state of the private protocol information via conntrack_netlink. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 339231537506846cb232a2f0cc4a2c662b2d5b07 tree 76846aa4c8b94b2bc9caaaa9650c46658fad4fe9 parent a051a8f7306476af0a74370ad56e793cb6c43bf7 author Pablo Neira Ayuso Mon, 10 Oct 2005 21:23:28 -0700 committer David S. Miller Mon, 10 Oct 2005 21:23:28 -0700 [NETFILTER] ctnetlink: allow userspace to change TCP state This patch adds the ability of changing the state a TCP connection. I know that this must be used with care but it's required to provide a complete conntrack creation via conntrack_netlink. So I'll document this aspect on the upcoming docs. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a051a8f7306476af0a74370ad56e793cb6c43bf7 tree 3dc8bc67e6c16a28a0161ed7f7fb55008da3d7d5 parent d4875b049b2e6401a6e1fae90b7f09e20a636fcf author Harald Welte Mon, 10 Oct 2005 21:21:10 -0700 committer David S. Miller Mon, 10 Oct 2005 21:21:10 -0700 [NETFILTER]: Use only 32bit counters for CONNTRACK_ACCT Initially we used 64bit counters for conntrack-based accounting, since we had no event mechanism to tell userspace that our counters are about to overflow. With nfnetlink_conntrack, we now have such a event mechanism and thus can save 16bytes per connection. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d4875b049b2e6401a6e1fae90b7f09e20a636fcf tree a5021c091cbd141675cdd90ac330d33188284c03 parent a02a64223eddb410712b015fb3342c9a316ab70b author Herbert Xu Mon, 10 Oct 2005 21:11:34 -0700 committer David S. Miller Mon, 10 Oct 2005 21:11:34 -0700 [IPSEC] Fix block size/MTU bugs in ESP This patch fixes the following bugs in ESP: * Fix transport mode MTU overestimate. This means that the inner MTU is smaller than it needs be. Worse yet, given an input MTU which is a multiple of 4 it will always produce an estimate which is not a multiple of 4. For example, given a standard ESP/3DES/MD5 transform and an MTU of 1500, the resulting MTU for transport mode is 1462 when it should be 1464. The reason for this is because IP header lengths are always a multiple of 4 for IPv4 and 8 for IPv6. * Ensure that the block size is at least 4. This is required by RFC2406 and corresponds to what the esp_output function does. At the moment this only affects crypto_null as its block size is 1. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a02a64223eddb410712b015fb3342c9a316ab70b tree 771285d98ae94517f0aa0b16af0208d4cdc55dda parent e1c73b78e3706bd3c336d4730a01dd4081dfb7ee author Herbert Xu Mon, 10 Oct 2005 21:11:08 -0700 committer David S. Miller Mon, 10 Oct 2005 21:11:08 -0700 [IPSEC]: Use ALIGN macro in ESP This patch uses the macro ALIGN in all the applicable spots for ESP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 08eb8f124f990aa476589d1f7810f7ec7f259c08 tree 2c303b6c0bc4a2c41ed493af7713e3088ba0482c parent b8df110fea555d5088bba67f446c2435104405be author David S. Miller Mon, 10 Oct 2005 21:02:26 -0700 committer David S. Miller Mon, 10 Oct 2005 21:02:26 -0700 [SPARC32]: Revert IOMAP change eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a Breakage noted by Al Viro. It breaks non-PCI builds, it's probably better to have a more direct implementation on sparc32, and which driver actually needs this is still questionable. We can resolve this in 2.6.15 Signed-off-by: David S. Miller commit e1c73b78e3706bd3c336d4730a01dd4081dfb7ee tree 1187db9206c73a3a37195a6f95d81dabc8932cb8 parent 5bbc243aafff9ad653dc7a9fa7bcaf0b4631355a author Pablo Neira Ayuso Mon, 10 Oct 2005 20:55:49 -0700 committer David S. Miller Mon, 10 Oct 2005 20:55:49 -0700 [NETFILTER] ctnetlink: add one nesting level for TCP state To keep consistency, the TCP private protocol information is nested attributes under CTA_PROTOINFO_TCP. This way the sequence of attributes to access the TCP state information looks like here below: CTA_PROTOINFO CTA_PROTOINFO_TCP CTA_PROTOINFO_TCP_STATE instead of: CTA_PROTOINFO CTA_PROTOINFO_TCP_STATE Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 5bbc243aafff9ad653dc7a9fa7bcaf0b4631355a tree 2d958403be2219e322c5106406c650e79d450f0b parent a1bcc3f26885b0a8bf04799551de2e9574ccbda1 author Harald Welte Mon, 10 Oct 2005 20:54:01 -0700 committer David S. Miller Mon, 10 Oct 2005 20:54:01 -0700 [NETFILTER]: Add missing include to ip_conntrack_tuple.h Without this #include, __be16 is not defined and userspace programs will break. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a1bcc3f26885b0a8bf04799551de2e9574ccbda1 tree 36397c29c8ad0eeb945117674734fc235ab4bebc parent d000eaf7720cb12cd03cd3d55f71be44357d27a9 author Pablo Neira Ayuso Mon, 10 Oct 2005 20:53:16 -0700 committer David S. Miller Mon, 10 Oct 2005 20:53:16 -0700 [NETFILTER] ctnetlink: ICMP ID is not mandatory The ID is only required by ICMP type 8 (echo), so it's not mandatory for all sort of ICMP connections. This patch makes mandatory only the type and the code for ICMP netlink messages. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d000eaf7720cb12cd03cd3d55f71be44357d27a9 tree cbdb3e64a427adedf7f6ec4a75b338d1731bc9ee parent b3a91d037a2575040f9b6a483f60c407a3d80368 author Harald Welte Mon, 10 Oct 2005 20:52:51 -0700 committer David S. Miller Mon, 10 Oct 2005 20:52:51 -0700 [NETFILTER] conntrack_netlink: Fix endian issue with status from userspace When we send "status" from userspace, we forget to convert the endianness. This patch adds the reqired conversion. Thanks to Pablo Neira for discovering this. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit b3a91d037a2575040f9b6a483f60c407a3d80368 tree 013652fd0d1b089bd9229fe4af47177e0d055b43 parent ebe0bbf06c9e03613bdcb6b5a704595a9344b7ff author Harald Welte Mon, 10 Oct 2005 20:52:36 -0700 committer David S. Miller Mon, 10 Oct 2005 20:52:36 -0700 [NETFILTER] nat: remove bogus structure member When 'rustynat' was merged in 2.6.12, the use of the "helper" pointer of struct ipt_nat_info was obsoleted, but the pointer not removed from the struct. This patch removes the pointer, thereby yet again shrinking struct ip_conntrack. Discovered-by: Rusty Russell Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ebe0bbf06c9e03613bdcb6b5a704595a9344b7ff tree 33453cb2cd33095e3a226d0866bdfe1019473646 parent f40863cec87464f3f4ec3a6c00e3fda3bbb0c91b author Harald Welte Mon, 10 Oct 2005 20:52:19 -0700 committer David S. Miller Mon, 10 Oct 2005 20:52:19 -0700 [NETFILTER] nfnetlink: use highest bit of nfa_type to indicate nested TLV As Henrik Nordstrom pointed out, all our efforts with "split endian" (i.e. host byte order tags, net byte order values) are useless, unless a parser can determine whether an attribute is nested or not. This patch steals the highest bit of nfattr.nfa_type to indicate whether the data payload contains a nested nfattr (1) or not (0). This will break userspace compatibility, but luckily no kernel with nfnetlink was released so far. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit f40863cec87464f3f4ec3a6c00e3fda3bbb0c91b tree e2945b3cae7237392c04969ff808a0c011f911a0 parent 85d9b05d9b1edad9a2630584754720a957ab0a2a author Harald Welte Mon, 10 Oct 2005 20:51:53 -0700 committer David S. Miller Mon, 10 Oct 2005 20:51:53 -0700 [NETFILTER] ipt_ULOG: Mark ipt_ULOG as OBSOLETE Similar to nfnetlink_queue and ip_queue, we mark ipt_ULOG as obsolete. This should have been part of the original nfnetlink_log merge, but I somehow missed it. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 85d9b05d9b1edad9a2630584754720a957ab0a2a tree 5a3ad0385af05c05bf50354bc6fc398474f0f9ae parent 907a42617970a159361f17ef9a63f04d276995ab author Harald Welte Mon, 10 Oct 2005 20:47:42 -0700 committer David S. Miller Mon, 10 Oct 2005 20:47:42 -0700 [NETFILTER] PPTP helper: Add missing Kconfig dependency PPTP should not be selectable without conntrack enabled Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit b8df110fea555d5088bba67f446c2435104405be tree 1bb8dfc1a6eadcab3e6df99aff4ae6cde38e94b4 parent 907a42617970a159361f17ef9a63f04d276995ab author David S. Miller Mon, 10 Oct 2005 20:43:22 -0700 committer David S. Miller Mon, 10 Oct 2005 20:43:22 -0700 [SPARC64]: Fix oops on runlevel change with serial console. Incorrect uart_write_wakeup() calls cause reference to a NULL tty pointer in sunsab and sunzilog serial drivers. Signed-off-by: David S. Miller