From: Jan-Benedict G. <jb...@he...> - 2006-04-10 21:02:20
|
Documentation/DocBook/libata.tmpl | 2 Documentation/scsi/scsi_eh.txt | 14 Documentation/scsi/scsi_mid_low_api.txt | 19 - arch/sparc64/Kconfig | 3 arch/sparc64/defconfig | 10 arch/sparc64/kernel/ptrace.c | 23 + arch/sparc64/kernel/smp.c | 35 -- arch/sparc64/kernel/traps.c | 4 drivers/char/random.c | 1 drivers/net/irda/irda-usb.c | 363 +++++++++++++++++++-- drivers/net/irda/irda-usb.h | 43 +- drivers/net/irda/smsc-ircc2.c | 311 +++++++++++++++++ drivers/net/netconsole.c | 1 drivers/net/tg3.c | 100 +++-- drivers/net/tg3.h | 3 drivers/scsi/ahci.c | 1 drivers/scsi/ata_piix.c | 1 drivers/scsi/hosts.c | 12 drivers/scsi/libata-core.c | 1 drivers/scsi/libata-scsi.c | 8 drivers/scsi/libata.h | 1 drivers/scsi/pdc_adma.c | 1 drivers/scsi/sata_mv.c | 1 drivers/scsi/sata_nv.c | 1 drivers/scsi/sata_promise.c | 1 drivers/scsi/sata_qstor.c | 1 drivers/scsi/sata_sil.c | 1 drivers/scsi/sata_sil24.c | 1 drivers/scsi/sata_sis.c | 1 drivers/scsi/sata_svw.c | 1 drivers/scsi/sata_sx4.c | 1 drivers/scsi/sata_uli.c | 1 drivers/scsi/sata_via.c | 1 drivers/scsi/sata_vsc.c | 1 drivers/scsi/scsi_error.c | 4 include/linux/libata.h | 1 include/linux/mm.h | 5 include/linux/netfilter.h | 42 ++ include/linux/netfilter_ipv4.h | 2 include/linux/netfilter_ipv4/ip_conntrack_h323.h | 52 +++ include/linux/netfilter_ipv6.h | 3 include/linux/page-flags.h | 8 include/net/inet6_hashtables.h | 70 ---- include/net/ip.h | 1 include/net/x25device.h | 1 include/scsi/scsi_host.h | 1 include/scsi/scsi_transport.h | 5 mm/page_alloc.c | 31 + net/bluetooth/sco.c | 2 net/bridge/br_netfilter.c | 13 net/core/dev.c | 5 net/core/dv.c | 5 net/core/flow.c | 4 net/core/gen_estimator.c | 3 net/core/neighbour.c | 14 net/core/net-sysfs.c | 2 net/core/request_sock.c | 4 net/ipv4/fib_trie.c | 14 net/ipv4/ip_fragment.c | 15 net/ipv4/ip_gre.c | 2 net/ipv4/ip_output.c | 6 net/ipv4/ipip.c | 4 net/ipv4/netfilter.c | 50 ++ net/ipv4/netfilter/Kconfig | 1 net/ipv4/netfilter/arptable_filter.c | 19 - net/ipv4/netfilter/ip_conntrack_helper_h323.c | 66 +-- net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | 2 net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 23 - net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 7 net/ipv4/netfilter/ip_conntrack_proto_udp.c | 7 net/ipv4/netfilter/ip_conntrack_standalone.c | 268 ++++++--------- net/ipv4/netfilter/ip_nat_helper_h323.c | 71 ---- net/ipv4/netfilter/ip_nat_rule.c | 2 net/ipv4/netfilter/ip_nat_standalone.c | 159 +++------ net/ipv4/netfilter/ip_queue.c | 31 - net/ipv4/netfilter/ipt_CLUSTERIP.c | 40 -- net/ipv4/netfilter/ipt_REJECT.c | 9 net/ipv4/netfilter/iptable_filter.c | 21 - net/ipv4/netfilter/iptable_mangle.c | 33 - net/ipv4/netfilter/iptable_raw.c | 35 -- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 223 ++++-------- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 20 - net/ipv4/tunnel4.c | 8 net/ipv4/xfrm4_input.c | 4 net/ipv6/inet6_hashtables.c | 80 ++++ net/ipv6/ip6_tunnel.c | 12 net/ipv6/netfilter.c | 52 ++- net/ipv6/netfilter/ip6_queue.c | 31 - net/ipv6/netfilter/ip6table_filter.c | 21 - net/ipv6/netfilter/ip6table_mangle.c | 33 - net/ipv6/netfilter/ip6table_raw.c | 15 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 179 +++------- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 12 net/ipv6/sit.c | 2 net/ipv6/tunnel6.c | 8 net/netfilter/core.c | 51 ++ net/netfilter/nf_conntrack_proto_tcp.c | 50 -- net/netfilter/nf_conntrack_proto_udp.c | 50 -- net/netfilter/nf_conntrack_standalone.c | 115 +++--- net/netfilter/nf_queue.c | 49 -- net/netfilter/nfnetlink_log.c | 25 - net/netfilter/nfnetlink_queue.c | 27 - net/sched/act_police.c | 8 security/keys/key.c | 4 security/keys/keyring.c | 1 105 files changed, 1739 insertions(+), 1473 deletions(-) New commits: commit 58b298c69358c4c8e22cb64ed2e4346724823d27 Merge: ebe9c64... 1b72373... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon Apr 10 22:56:52 2006 +0200 Merge branch 'master' commit 1b72373491a061be6d456d219a4e2d054ac2aaad Author: Jeff Garzik <je...@ga...> Date: Mon Apr 10 14:56:39 2006 -0400 [libata] sata_mv: fix can_queue line accidentally removed in scsi-eh patch commit 9227c33de80ac01f269ed33624990ce84358e419 Author: Christoph Hellwig <hc...@ls...> Date: Sat Apr 1 19:21:04 2006 +0200 [PATCH] move ->eh_strategy_handler to the transport class Overriding the whole EH code is a per-transport, not per-host thing. Move ->eh_strategy_handler to the transport class, same as ->eh_timed_out. Downside is that scsi_host_alloc can't check for the total lack of EH anymore, but the transition period from old EH where we needed it is long gone already. Signed-off-by: Christoph Hellwig <hc...@ls...> Signed-off-by: Jeff Garzik <je...@ga...> commit 676165a8af7167f488abdcce6851a9bc36e83254 Author: Nick Piggin <pi...@cy...> Date: Mon Apr 10 11:21:48 2006 +1000 [PATCH] Fix buddy list race that could lead to page lru list corruptions Rohit found an obscure bug causing buddy list corruption. page_is_buddy is using a non-atomic test (PagePrivate && page_count == 0) to determine whether or not a free page's buddy is itself free and in the buddy lists. Each of the conjuncts may be true at different times due to unrelated conditions, so the non-atomic page_is_buddy test may find each conjunct to be true even if they were not both true at the same time (ie. the page was not on the buddy lists). Signed-off-by: Martin Bligh <mb...@go...> Signed-off-by: Rohit Seth <roh...@go...> Signed-off-by: Nick Piggin <np...@su...> Signed-off-by: KAMEZAWA Hiroyuki <kam...@jp...> Signed-off-by: Linus Torvalds <tor...@os...> commit c3a9d6541f84ac3ff566982d08389b87c1c36b4e Author: David Howells <dho...@re...> Date: Mon Apr 10 15:15:21 2006 +0100 [Security] Keys: Fix oops when adding key to non-keyring This fixes the problem of an oops occuring when a user attempts to add a key to a non-keyring key [CVE-2006-1522]. The problem is that __keyring_search_one() doesn't check that the keyring it's been given is actually a keyring. I've fixed this problem by: (1) declaring that caller of __keyring_search_one() must guarantee that the keyring is a keyring; and (2) making key_create_or_update() check that the keyring is a keyring, and return -ENOTDIR if it isn't. This can be tested by: keyctl add user b b `keyctl add user a a @s` Signed-off-by: David Howells <dho...@re...> Signed-off-by: Linus Torvalds <tor...@os...> commit 460fbf82c0842cad3f3c744c4dcb81978b7829f3 Merge: 68491d5... b1a7ffc... Author: Linus Torvalds <tor...@g5...> Date: Mon Apr 10 08:46:00 2006 -0700 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: (35 commits) [IPV6]: Deinline few large functions in inet6 code [IPV4] ip_fragment: Always compute hash with ipfrag_lock held. [NETFILTER]: Fix DNAT in LOCAL_OUT [X25]: Restore skb->dev setting in x25_type_trans(). [NET]: Fix hotplug race during device registration. [IPV6]: Unexport secure_ipv6_port_ephemeral [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64 [NET]: More kzalloc conversions. [NET] kzalloc: use in alloc_netdev [PKT_SCHED] act_police: Rename methods. [TG3]: Speed up SRAM access (2nd version) [TG3]: Kill some less useful flags [NETFILTER]: H.323 helper: remove changelog [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions [NETFILTER]: Add address family specific checksum helpers [NETFILTER]: Introduce infrastructure for address family specific operations [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl' [NETFILTER]: H.323 helper: make get_h245_addr() static [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL ... commit 68491d5892defca59ad4f604cace2b1e30889c14 Author: David S. Miller <da...@su...> Date: Thu Apr 6 20:28:11 2006 -0700 [SPARC64]: Set ARCH_SELECT_MEMORY_MODEL Otherwise the build breaks with EXPERIMENTAL disabled because SPARSEMEM will not get selected properly. See mm/Kconfig for how that works. Signed-off-by: David S. Miller <da...@da...> commit aa1d1a0af6022f02fb601508d3feaabafd405299 Author: David S. Miller <da...@su...> Date: Thu Apr 6 16:54:33 2006 -0700 [SPARC64]: smp_call_function() fixups... 1) Take doc-book function comment from i386 implementation. 2) cacheline align call_lock, taken from powerpc 3) Need memory barrier after setting call_data 4) Remove timeout Signed-off-by: David S. Miller <da...@da...> commit 731bbe431f7dbbcbdc5293cfb187a916c375e83b Author: David S. Miller <da...@su...> Date: Tue Apr 4 16:54:40 2006 -0700 [SPARC64]: Translate PTRACE_GETEVENTMSG for 32-bit tasks. Signed-off-by: David S. Miller <da...@da...> commit 1608a96e7998bffd10fcb2440e8175cfb703fd95 Author: David S. Miller <da...@su...> Date: Sun Apr 2 19:31:30 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller <da...@da...> commit 955c054f7905e0a9ee4483b03f866f61e6929bec Author: David S. Miller <da...@su...> Date: Sat Apr 1 23:29:56 2006 -0800 [SPARC64]: Print out return PC in cheetah_log_errors(). This makes debugging things a little bit easier. Signed-off-by: David S. Miller <da...@da...> commit 1759e58ed2684b7a01cbb96864f23d18884f42ba Author: David S. Miller <da...@su...> Date: Sat Apr 1 23:28:10 2006 -0800 [SPARC64]: Add dummy PTRACE_PEEKUSR for gdb. GDB uses a PTRACE_PEEKUSR call with offset 0 to see if a thread is alive, so provide a success return for this particular special case. Signed-off-by: David S. Miller <da...@da...> commit b1a7ffcb7a047e99ab02424e651e0492f36095f7 Author: Denis Vlasenko <vd...@il...> Date: Sun Apr 9 22:48:59 2006 -0700 [IPV6]: Deinline few large functions in inet6 code Deinline a few functions which produce 200+ bytes of code. Size Uses Wasted Name and definition ===== ==== ====== ================================================ 429 3 818 __inet6_lookup include/net/inet6_hashtables.h 404 2 384 __inet6_lookup_established include/net/inet6_hashtables.h 206 3 372 __inet6_hash include/net/inet6_hashtables.h Signed-off-by: Denis Vlasenko <vd...@il...> Signed-off-by: David S. Miller <da...@da...> commit 55c0022e53452360064ea264c41410c70565d9f8 Author: David S. Miller <da...@su...> Date: Sun Apr 9 22:43:55 2006 -0700 [IPV4] ip_fragment: Always compute hash with ipfrag_lock held. Otherwise we could compute an inaccurate hash due to the random seed changing. Noticed by Zach Brown and patch is based upon some feedback from Herbert Xu. Signed-off-by: David S. Miller <da...@da...> commit 19910d1aec0b2b96ff4b4a93e2aed0d32643e850 Author: Patrick McHardy <ka...@tr...> Date: Sun Apr 9 22:38:29 2006 -0700 [NETFILTER]: Fix DNAT in LOCAL_OUT Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 9b591cbd4e0fc2911d105d88d354124467b2cc08 Author: David S. Miller <da...@su...> Date: Sun Apr 9 22:37:18 2006 -0700 [X25]: Restore skb->dev setting in x25_type_trans(). Noticed by Pascal Schlafer. Signed-off-by: David S. Miller <da...@da...> commit 9469d458b90bfb9117cbb488cfa645d94c3921b1 Author: Sergey Vlasov <vs...@al...> Date: Sun Apr 9 22:32:48 2006 -0700 [NET]: Fix hotplug race during device registration. From: Thomas de Grenier de Latour <deg...@ea...> On Sun, 9 Apr 2006 21:56:59 +0400, Sergey Vlasov <vs...@al...> wrote: > However, show_address() does not output anything unless > dev->reg_state == NETREG_REGISTERED - and this state is set by > netdev_run_todo() only after netdev_register_sysfs() returns, so in > the meantime (while netdev_register_sysfs() is busy adding the > "statistics" attribute group) some process may see an empty "address" > attribute. I've tried the attached patch, suggested by Sergey Vlasov on hotplug-devel@, and as far as i can test it works just fine. Signed-off-by: David S. Miller <da...@da...> commit 30aaa154fc21ad1ee4400e28009732a04a80862f Author: Adrian Bunk <bu...@st...> Date: Sun Apr 9 22:29:17 2006 -0700 [IPV6]: Unexport secure_ipv6_port_ephemeral This patch removes the unused EXPORT_SYMBOL(secure_ipv6_port_ephemeral). Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: David S. Miller <da...@da...> commit 503e4faad18baa62bb818537b920ad939749823e Author: Brian Haley <bri...@hp...> Date: Fri Apr 7 15:00:06 2006 -0700 [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64 Can't build with CONFIG_NETFILTER=y/m on IA64, there's a missing #include in net/ipv6/netfilter.c net/ipv6/netfilter.c: In function `nf_ip6_checksum': net/ipv6/netfilter.c:92: warning: implicit declaration of function `csum_ipv6_magic' Signed-off-by: Brian Haley <bri...@hp...> Signed-off-by: David S. Miller <da...@da...> commit 77d04bd957ddca9d48a664e28b40f33993f4550e Author: Andrew Morton <ak...@os...> Date: Fri Apr 7 14:52:59 2006 -0700 [NET]: More kzalloc conversions. Signed-off-by: David S. Miller <da...@da...> commit 31380de95cc3183bbb379339e67f83d69e56fbd6 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Thu Apr 6 22:38:28 2006 -0700 [NET] kzalloc: use in alloc_netdev Noticed this use, fixed it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Signed-off-by: David S. Miller <da...@da...> commit 83b950c89c8cc0dcc1b079c638be25915c9945f1 Author: Jamal Hadi Salim <ha...@cy...> Date: Thu Apr 6 22:24:22 2006 -0700 [PKT_SCHED] act_police: Rename methods. Rename policer specific _generic_ methods to be specific to _act_police_ Signed-off-by: Jamal Hadi Salim <ha...@cy...> Signed-off-by: David S. Miller <da...@da...> commit bbadf503d7c7e6efe0a4cd731f8855ba08276215 Author: Michael Chan <mc...@br...> Date: Thu Apr 6 21:46:34 2006 -0700 [TG3]: Speed up SRAM access (2nd version) Speed up SRAM read and write functions if possible by using MMIO instead of config. cycles. With this change, the post reset signature done at the end of D3 power change must now be moved before the D3 power change. IBM reported a problem on powerpc blades during ethtool self test that was caused by the memory test taking excessively long. Config. cycles are very slow on powerpc and the memory test can take more than 10 seconds to complete using config. cycles. David Miller informed me that an earlier version of the patch caused problems on sparc64 systems with built-in tg3 chips. This version fixes the problem by excluding all SUN built-in tg3 chips from doing MMIO SRAM access. TG3_FLAG_EEPROM_WRITE_PROT is also set unconditionally when TG3_FLG2_SUN_570X is set. This should be sane as all SUN chips are built-in and do not require Vaux switching. Signed-off-by: Michael Chan <mc...@br...> Signed-off-by: David S. Miller <da...@da...> commit d2d746f83b74022a50d28f7f0f496842c9cde330 Author: Michael Chan <mc...@br...> Date: Thu Apr 6 21:45:39 2006 -0700 [TG3]: Kill some less useful flags Kill the TG3_FLAG_NO_{TX|RX}_PSEUDO_CSUM flags because they are not very useful. This will free up some bits for new flags. Signed-off-by: Michael Chan <mc...@br...> Signed-off-by: David S. Miller <da...@da...> commit 7a43c9955178f1cc88374abe1186c0f2ef21e040 Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 16:16:51 2006 -0700 [NETFILTER]: H.323 helper: remove changelog Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 96f6bf82ea3abc77d255d5d554df5f349651f6de Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:19:24 2006 -0700 [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions Besides removing lots of duplicate code, all converted users benefit from improved HW checksum error handling. Tested with and without HW checksums in almost all combinations. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 422c346fad806e2abaeffac686860ebc98dfe33e Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:18:43 2006 -0700 [NETFILTER]: Add address family specific checksum helpers Add checksum operation which takes care of verifying the checksum and dealing with HW checksum errors and avoids multiple checksum operations by setting ip_summed to CHECKSUM_UNNECESSARY after successful verification. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit bce8032ef3cc58170ab3550e9e271dba7b4c4764 Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:18:09 2006 -0700 [NETFILTER]: Introduce infrastructure for address family specific operations Change the queue rerouter intrastructure to a generic usable infrastructure for address family specific operations as a base for some cleanups. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit a0aed49bdb2bbb4234789f241cffb607fd2e213d Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:17:27 2006 -0700 [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency When NAT is built as a module, ip_conntrack_netlink can not be linked statically. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit a0b7db5e86d30f470dc1849f4fa44ff77a813091 Author: Jing Min Zhao <zha...@us...> Date: Thu Apr 6 14:15:33 2006 -0700 [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl' default_rrq_ttl is used when no TTL is included in the RRQ. Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 51d42f5e4ee43fc98aa0c7a2a104808bb602276f Author: Jing Min Zhao <zha...@us...> Date: Thu Apr 6 14:14:59 2006 -0700 [NETFILTER]: H.323 helper: make get_h245_addr() static Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 0f249685fde399c01e51a63f2bdfe4a667db083c Author: Jing Min Zhao <zha...@us...> Date: Thu Apr 6 14:14:11 2006 -0700 [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 48bfee5fad0e46f4f18d46285efceba39e897482 Author: Jing Min Zhao <zha...@us...> Date: Thu Apr 6 14:13:42 2006 -0700 [NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h Move prototypes of NAT callbacks to ip_conntrack_h323.h. Because the use of typedefs as arguments, some header files need to be moved as well. Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 32292a7ff1d9306841a8da6ea286847b1070cc6a Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:11:30 2006 -0700 [NETFILTER]: Fix section mismatch warnings Fix section mismatch warnings caused by netfilter's init_or_cleanup functions used in many places by splitting the init from the cleanup parts. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 964ddaa10de8f3aeed12bc2a30726514ff309e64 Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:09:49 2006 -0700 [NETFILTER]: Clean up hook registration Clean up hook registration by makeing use of the new mass registration and unregistration helpers. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 972d1cb1427946f4980240363aac4e73fb375290 Author: Patrick McHardy <ka...@tr...> Date: Thu Apr 6 14:09:12 2006 -0700 [NETFILTER]: Add helper functions for mass hook registration/unregistration Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 137dc0233fba0bfa19679bdd96eb104f0e659c5a Author: Samuel Ortiz <sam...@no...> Date: Wed Apr 5 22:39:14 2006 -0700 [IRDA]: Support for Sigmatel STIR421x chip This patch enables support for the Sigmatel's STIR421x IrDA chip. Once patched with Sigmatel's firmware, this chip "almost" follows the USB-IrDA spec. Thus this patch is against irda-usb.[ch]. The code has been tested by Nick Fedchik on an STIR4210 chipset based dongle. Signed-off-by: Samuel Ortiz <sam...@no...> Signed-off-by: David S. Miller <da...@da...> commit c1e14a6ea2ae34993f431d2eb9a0f228ac3574eb Author: Linus Walleij <tr...@df...> Date: Wed Apr 5 22:33:59 2006 -0700 [IRDA]: smcinit merged into smsc-ircc driver This patch integrates the smcinit code into the smsc-ircc driver. Some laptops have their smsc-ircc chip not properly configured by the BIOS and needs some preconfiguration. Currently, this can be done from userspace with smcinit, a utility that comes with the irda-utils package. It messes with ioports and PCI settings, from userspace. Now with this patch, if we happen to be on one of the known to be faulty laptops, we preconfigure the chip from the driver. Patch from Linus Walleij <tr...@df...> Signed-off-by: Samuel Ortiz <sam...@no...> Signed-off-by: David S. Miller <da...@da...> commit 45af08be6d120690d379cb8421ebaf9d9f86ba52 Author: Herbert Xu <he...@go...> Date: Wed Apr 5 22:31:19 2006 -0700 [INET]: Use port unreachable instead of proto for tunnels This patch changes GRE and SIT to generate port unreachable instead of protocol unreachable errors when we can't find a matching tunnel for a packet. This removes the ambiguity as to whether the error is caused by no tunnel being found or by the lack of support for the given tunnel type. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit cdee5751bf91d02616aaf30a5affef56105e3b79 Author: Eric Sesterhenn <sna...@gm...> Date: Wed Apr 5 22:28:14 2006 -0700 [BLUETOOTH] sco: Possible double free. this fixes coverity bug id #1068. hci_send_sco() frees skb if (skb->len > hdev->sco_mtu). Since it returns a negative error value only in this case, we can directly return here. Signed-off-by: Eric Sesterhenn <sna...@gm...> Signed-off-by: David S. Miller <da...@da...> commit ad96b485b4224785bcca478cfba02d06c46ee575 Author: Adrian Bunk <bu...@st...> Date: Wed Apr 5 22:21:04 2006 -0700 [TG3]: Fix a memory leak. This patch fixes a memory leak (buf wasn't freed) spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: David S. Miller <da...@da...> commit e3a5cd9edff9a7a20de3c88c9d479704da98fb85 Author: Adrian Bunk <bu...@st...> Date: Wed Apr 5 22:19:47 2006 -0700 [NET]: Fix an off-by-21-or-49 error. This patch fixes an off-by-21-or-49 error ;-) spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: David S. Miller <da...@da...> commit d938ab44c0c5418bb74a97b422a070e2cdccce22 Author: Randy Dunlap <rd...@xe...> Date: Tue Apr 4 20:11:56 2006 -0700 [NET] netconsole: set .name in struct console Set .name in netconsole's struct console to identify the struct's owner. Signed-off-by: Randy Dunlap <rd...@xe...> Acked-by: Matt Mackall <mp...@se...> Signed-off-by: David S. Miller <da...@da...> commit 50fba2aa7cefa6b0e1768cb350c9e69042320c03 Author: Herbert Xu <he...@go...> Date: Tue Apr 4 13:50:45 2006 -0700 [INET]: Move no-tunnel ICMP error to tunnel4/tunnel6 This patch moves the sending of ICMP messages when there are no IPv4/IPv6 tunnels present to tunnel4/tunnel6 respectively. Please note that for now if xfrm4_tunnel/xfrm6_tunnel is loaded then no ICMP messages will ever be sent. This is similar to how we handle AH/ESP/IPCOMP. This move fixes the bug where we always send an ICMP message when there is no ip6_tunnel device present for a given packet even if it is later handled by IPsec. It also causes ICMP messages to be sent when no IPIP tunnel is present. I've decided to use the "port unreachable" ICMP message over the current value of "address unreachable" (and "protocol unreachable" by GRE) because it is not ambiguous unlike the other ones which can be triggered by other conditions. There seems to be no standard specifying what value must be used so this change should be OK. In fact we should change GRE to use this value as well. Incidentally, this patch also fixes a fairly serious bug in xfrm6_tunnel where we don't check whether the embedded IPv6 header is present before dereferencing it for the inside source address. This patch is inspired by a previous patch by Hugo Santos <hs...@av...>. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 2e2f7aefa8a8ba4adb6ecee8cbb43fbe9ca4cc89 Author: Patrick McHardy <ka...@tr...> Date: Tue Apr 4 13:42:35 2006 -0700 [NETFILTER]: Fix fragmentation issues with bridge netfilter The conntrack code doesn't do re-fragmentation of defragmented packets anymore but relies on fragmentation in the IP layer. Purely bridged packets don't pass through the IP layer, so the bridge netfilter code needs to take care of fragmentation itself. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 550e29bc96e6f1ced2bca82dace197b009434367 Author: Robert Olsson <rob...@it...> Date: Tue Apr 4 12:53:35 2006 -0700 [FIB_TRIE]: Fix leaf freeing. Seems like leaf (end-nodes) has been freed by __tnode_free_rcu and not by __leaf_free_rcu. This fixes the problem. Only tnode_free is now used which checks for appropriate node type. free_leaf can be removed. Signed-off-by: Robert Olsson <rob...@it...> Signed-off-by: David S. Miller <da...@da...> commit 8bf4b8a1083694d5aac292f92705ddd3aec29be6 Author: Herbert Xu <he...@go...> Date: Tue Apr 4 12:51:05 2006 -0700 [IPSEC]: Check x->encap before dereferencing it We need to dereference x->encap before dereferencing it for encap_type. If it's absent then the encap_type is zero. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> |