commit 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f tree e0977d906193eadeafebc442775491b844be79d5 parent 4c84a39c8adba6bf2f829b217e78bfd61478191a parent 1723b4a34af85447684c9696af83929d2c1e8e6b author Linus Torvalds Mon, 19 Jun 2006 19:07:12 -0700 committer Linus Torvalds Mon, 19 Jun 2006 19:07:12 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits) [MIPS] Make timer interrupt frequency configurable from kconfig. [MIPS] Correct HAL2 Kconfig description [MIPS] Fix R4K cache macro names [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. [MIPS] SN: include asm/sn/types.h for nasid_t. [MIPS] Random fixes for sb1250 [MIPS] Fix bcm1480 compile [MIPS] Remove support for NEC DDB5476. [MIPS] Remove support for NEC DDB5074. [MIPS] Cleanup memory managment initialization. [MIPS] SN: Declare bridge_pci_ops. [MIPS] Remove unused function alloc_pci_controller. [MIPS] IP27: Extract pci_ops into separate file. [MIPS] IP27: Use symbolic constants instead of magic numbers. [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. [MIPS] IP27: Cleanup N/M mode configuration. [MIPS] IP27: Throw away old unused hacks. ... commit 4c84a39c8adba6bf2f829b217e78bfd61478191a tree 0f0f415099cf49d894d65e5120563d30cf1a0fc9 parent d0b952a9837f81cd89e756b1b34293fa6e1cb59d parent 9ead190bfde2a434c74ea604382d08acb2eceef5 author Linus Torvalds Mon, 19 Jun 2006 19:01:59 -0700 committer Linus Torvalds Mon, 19 Jun 2006 19:01:59 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (46 commits) IB/uverbs: Don't serialize with ib_uverbs_idr_mutex IB/mthca: Make all device methods truly reentrant IB/mthca: Fix memory leak on modify_qp error paths IB/uverbs: Factor out common idr code IB/uverbs: Don't decrement usecnt on error paths IB/uverbs: Release lock on error path IB/cm: Use address handle helpers IB/sa: Add ib_init_ah_from_path() IB: Add ib_init_ah_from_wc() IB/ucm: Get rid of duplicate P_Key parameter IB/srp: Factor out common request reset code IB/srp: Support SRP rev. 10 targets [SCSI] srp.h: Add I/O Class values IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool. IB/mthca: Fill in max_map_per_fmr device attribute IB/ipath: Add client reregister event generation IB/mthca: Add client reregister event generation IB: Move struct port_info from ipath to IPoIB: Handle client reregister events IB: Add client reregister event type ... commit d0b952a9837f81cd89e756b1b34293fa6e1cb59d tree fbe488bc5f407afa0e91cefb262d9e9ee69062ac parent d90125bfe958ed0451c6b98f831c86aba08b43d5 parent 47552c4e555eefe381f3d45140b59a2ea4b16486 author Linus Torvalds Mon, 19 Jun 2006 18:55:56 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:55:56 -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: (109 commits) [ETHTOOL]: Fix UFO typo [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. [SCTP]: Send only 1 window update SACK per message. [SCTP]: Don't do CRC32C checksum over loopback. [SCTP] Reset rtt_in_progress for the chunk when processing its sack. [SCTP]: Reject sctp packets with broadcast addresses. [SCTP]: Limit association max_retrans setting in setsockopt. [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. [IPV6]: Sum real space for RTAs. [IRDA]: Use put_unaligned() in irlmp_do_discovery(). [BRIDGE]: Add support for NETIF_F_HW_CSUM devices [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM [TG3]: Convert to non-LLTX [TG3]: Remove unnecessary tx_lock [TCP]: Add tcp_slow_start_after_idle sysctl. [BNX2]: Update version and reldate [BNX2]: Use CPU native page size [BNX2]: Use compressed firmware [BNX2]: Add firmware decompression [BNX2]: Allow WoL settings on new 5708 chips ... Manual fixup for conflict in drivers/net/tulip/winbond-840.c commit d90125bfe958ed0451c6b98f831c86aba08b43d5 tree 3a9ea24091f958a92e1d0d12f5135e50adf71b31 parent bfd189a8e944dd0b8135dea2c23ac399bbe34535 parent 2abac1db3522d9f56c695d1b42e77f3e52d4c51a author Linus Torvalds Mon, 19 Jun 2006 18:53:20 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:53:20 -0700 Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits) intelfb: fixup clock calculation debugging. Removed hard coded EDID buffer size. intelfb: use regular modedb table instead of VESA intelfb: use firmware EDID for mode database Revert "intelfb driver -- use the regular modedb table instead of the VESA" intelfb: int option fix sync modesetting code with X.org intelfb: align with changes from my X driver. intelfb driver -- use the regular modedb table instead of the VESA Adds support for 256MB aperture on 945 chipsets to the intelfb driver intelfb -- uses stride alignment of 64 on the 9xx chipsets. intelfb: some cleanups for intelfbhw intelfb: fixup pitch calculation like X does intelfb: fixup p calculation This patch makes a needlessly global struct static. intelfb: add i945GM support intelfb: fixup whitespace.. intelfb: add hw cursor support for i9xx intelfb: make i915 modeset intelfb: add support for i945G ... commit bfd189a8e944dd0b8135dea2c23ac399bbe34535 tree 89f2963ec3e2df7b9b980587ec2d2a334c7e2172 parent bbf70132db2767f66b411fa90488aacac72e06dd parent 81c246691535ee3f865fbe6804b3be1b2c159e95 author Linus Torvalds Mon, 19 Jun 2006 18:51:41 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:51:41 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] alpha-agp warning fix [AGPGART] uninorth-agp warning fixes [AGPGART] Remove pointless initialisation in intel-agp [AGPGART] Remove pointless code from agp_generic_create_gatt_table() commit bbf70132db2767f66b411fa90488aacac72e06dd tree 19bebd76503c351f74e2fc24ac161b20c8d30fd4 parent 2090af718014f3d434fb8b85b00eeea01ebcec19 parent 6ccf58ab22499139bacc683493c9fd70af55adbb author Linus Torvalds Mon, 19 Jun 2006 18:51:21 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:51:21 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] sets nforce2 minimum PLL divider to 2. [CPUFREQ] Make powernow-k7 work on SMP kernels. [CPUFREQ] cpufreq core {d,}printk adjustments [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino [CPUFREQ] dprintk adjustments to cpufreq-nforce2 [CPUFREQ] Prepare powernow-k8 for future CPUs. [CPUFREQ] Make acpi-cpufreq 'sticky'. [CPUFREQ] Remove strange No-op from longrun.c [CPUFREQ] Remove more freq_table reinitialisations. [CPUFREQ] Fix another redundant initialisation in freq_table [CPUFREQ] Remove duplicate assignment in freq_table [CPUFREQ] CodingStyle nits in cpufreq_stats.c [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq [CPUFREQ] Remove pointless reinitialisation from powernow-k8 [CPUFREQ] Remove redundant initialisation from longhaul. [CPUFREQ] Clean up longhaul's speed pretty-printer [CPUFREQ] Disambiguate loop indexes in powernow-k7 [CPUFREQ] Typo in powernow-k8 commit 2090af718014f3d434fb8b85b00eeea01ebcec19 tree 97eb6e655a3c2d90c212de79b563fa35837a341f parent 557240b48e2dc4f6fa878afc3fc767ad745ca7ed parent 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a author Linus Torvalds Mon, 19 Jun 2006 18:50:43 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:50:43 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (166 commits) [PATCH] net: au1000_eth: PHY framework conversion [PATCH] 3c5zz ethernet: fix section warnings [PATCH] smc ethernet: fix section mismatch warnings [PATCH] hp ethernet: fix section mismatches [PATCH] Section mismatch in drivers/net/ne.o during modpost [PATCH] e1000: prevent statistics from getting garbled during reset [PATCH] smc911x Kconfig fix [PATCH] forcedeth: new device ids [PATCH] forcedeth config: version [PATCH] forcedeth config: module parameters [PATCH] forcedeth config: diagnostics [PATCH] forcedeth config: move functions [PATCH] forcedeth config: statistics [PATCH] forcedeth config: csum [PATCH] forcedeth config: wol [PATCH] forcedeth config: phy [PATCH] forcedeth config: flow control [PATCH] forcedeth config: ring sizes [PATCH] forcedeth config: tso cleanup [DOC] Update bonding documentation with sysfs info ... commit 557240b48e2dc4f6fa878afc3fc767ad745ca7ed tree 354e9de17c28b438db675f6a2b779415f1634c45 parent 5603509137940f4cbc577281cee62110d4097b1b author Linus Torvalds Mon, 19 Jun 2006 18:16:01 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:16:01 -0700 Add support for suspending and resuming the whole console subsystem Trying to suspend/resume with console messages flying all around is doomed to failure, when the devices that the messages are trying to go to are being shut down. Signed-off-by: Linus Torvalds commit 5603509137940f4cbc577281cee62110d4097b1b tree def89e77479baa644160ffa1467b1ead0ac88e2f parent 1cca0ebbb74298958dae1d1d3e7e9287c98a720c author Linus Torvalds Mon, 19 Jun 2006 18:05:09 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:05:09 -0700 Make sure to re-enable SCI after an ACPI suspend According to the ACPI spec, it should be enabled on return from suspend, but bugs happen. Apparently especially on the Apple Intel Macs. Signed-off-by: Linus Torvalds commit 1cca0ebbb74298958dae1d1d3e7e9287c98a720c tree b41fa520bf848584a91e4e0d9fd3aa22d99c0f86 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Linus Torvalds Mon, 19 Jun 2006 18:01:27 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:01:27 -0700 Improve SATA core suspend/resume Doing a full ata_busy_sleep() seems to get suspend and resume working fine on the Apple Mac Mini, at least. Signed-off-by: Linus Torvalds commit 1723b4a34af85447684c9696af83929d2c1e8e6b tree ffd16da24a0a6a661d21d1b1f8ef85f0f3b615d9 parent b97b36bfd761d83f714eb1b5d6bce519794fa650 author Atsushi Nemoto Tue, 20 Jun 2006 00:19:13 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:27 +0100 [MIPS] Make timer interrupt frequency configurable from kconfig. Make HZ configurable. DECSTATION can select 128/256/1024 HZ, JAZZ can only select 100 HZ, others can select 100/128/250/256/1000/1024 HZ if not explicitly specified). Also remove all mach-xxx/param.h files and update all defconfigs according to current HZ value. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b97b36bfd761d83f714eb1b5d6bce519794fa650 tree 256963db26c9ce44451cb48ee893c64a1322453a parent c3b1c2de2254aa4721e7e3c8d418fa9302e6acb0 author Kumba Sun, 18 Jun 2006 02:17:08 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Correct HAL2 Kconfig description The current HAL2 Kconfig description indicates it is only used on SGI Indy systems, however all members of the Indigo2 Family have this sound card as well. Plus a minor grammatical fix is included. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit c3b1c2de2254aa4721e7e3c8d418fa9302e6acb0 tree 81939a7c5aa1a7ec369d1899dd0df35fbe51d8ae parent 2493921c284813b9f512c95d972a302cf82296cb author Kumba Sun, 18 Jun 2006 02:17:01 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Fix R4K cache macro names Several machines have the R4K cache macro name spelled incorrectly. Namely, they have cpu_has_4kcache defined instead of cpu_has_4k_cache. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 2493921c284813b9f512c95d972a302cf82296cb tree cda347ae07400e2aa277b52ee5ba27d1b7b5588c parent 35189fad3cb5f6e3ab66c8321928a851de0cd2b1 author Kumba Sun, 18 Jun 2006 02:16:53 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 Keeping in accordance with other machines, IP27 and IP32 lack a few macros. IP27 lacks cpu_has_4kex & cpu_has_4k_cache macros while IP32 lacks just the cpu_has_4k_cache macro. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 35189fad3cb5f6e3ab66c8321928a851de0cd2b1 tree 70dcd11a08d964da9ee27bc716b2205f250b42dd parent 355c471f2ff324c21f8a1fb8e2e242a0f2a4aa68 author Ralf Baechle Sun, 18 Jun 2006 16:39:46 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit 355c471f2ff324c21f8a1fb8e2e242a0f2a4aa68 tree 8a491d03e865b9e16686004dea765a141e048219 parent 4a0312fca6599299bbed944ce09278d90388a3e5 author dmitry pervushin Sun, 21 May 2006 14:53:06 +0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board Signed-off-by: dmitry pervushin Signed-off-by: Ralf Baechle commit 4a0312fca6599299bbed944ce09278d90388a3e5 tree cde9b9d353eab1aa7ab062c2a958986bd45c1f24 parent b00f473e1af9a11454e572de1ea446eb672e700d author Thomas Bogendoerfer Tue, 13 Jun 2006 13:59:01 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. Added support for RM200C machines with big endian firmware Added support for RM200-C40 (R5000 support) Signed-off-by: Florian Lohoff Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit b00f473e1af9a11454e572de1ea446eb672e700d tree daed429452901d2b1d3d09380e2b9467b4f68cda parent 4fb60a4b80f9db94605c2a47807d34dfb9ae44c8 author Ralf Baechle Sat, 17 Jun 2006 10:56:26 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] SN: include asm/sn/types.h for nasid_t. Signed-off-by: Ralf Baechle commit 4fb60a4b80f9db94605c2a47807d34dfb9ae44c8 tree 07f454d04edd7a02b8e6d8a8c7ec04b6b0d1aec6 parent b75d4c1d686aff4f8f9ea96b2e8908a3454a3ff3 author Thiemo Seufer Sun, 18 Jun 2006 05:23:47 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Random fixes for sb1250 Random improvements for sb1250: Silence compiler warnings, a bugfix for the profiling code, and a comment typo. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit b75d4c1d686aff4f8f9ea96b2e8908a3454a3ff3 tree 037024e26c3f91919dbbcb35fb0af341970c64eb parent 470b160364db5b8096b8e557a23c97eb6612be67 author Thiemo Seufer Sun, 18 Jun 2006 05:17:54 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Fix bcm1480 compile Fix compilation for bcm1480, a hpt is only available on sb1250/bcm112x. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 470b160364db5b8096b8e557a23c97eb6612be67 tree e788b9548129880ecf5f6a7be89d7f1380050616 parent eaff3888742155bd397e45a1c3323c0173042e5b author Ralf Baechle Sun, 18 Jun 2006 05:28:38 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Remove support for NEC DDB5476. As warned several times before. Signed-off-by: Ralf Baechle commit eaff3888742155bd397e45a1c3323c0173042e5b tree bf8ee6203072e01ce0d50db5898137c7552da6e5 parent 2925aba4223f4532e85f0c6f64584b3e0b2849c3 author Ralf Baechle Sun, 18 Jun 2006 04:58:57 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Remove support for NEC DDB5074. As warned several times before. Signed-off-by: Ralf Baechle commit 2925aba4223f4532e85f0c6f64584b3e0b2849c3 tree 1a7d38a22db3b745926232d665d6653baa47ee61 parent 7ab2dc41d15f31e9d5472e46148337b4cf7c941c author Ralf Baechle Sun, 18 Jun 2006 01:32:22 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] Cleanup memory managment initialization. Historically plat_mem_setup did the entire platform initialization. This was rather impractical because it meant plat_mem_setup had to get away without any kind of memory allocator. To keep old code from breaking plat_setup was just renamed to plat_setup and a second platform initialization hook for anything else was introduced. Signed-off-by: Ralf Baechle commit 7ab2dc41d15f31e9d5472e46148337b4cf7c941c tree f42d6678527130086997dfb3fe8e7a7f41dbf933 parent 610019baddcb4c4c323c12cd44ca7f73d7145d6f author Ralf Baechle Sat, 17 Jun 2006 14:55:40 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] SN: Declare bridge_pci_ops. Signed-off-by: Ralf Baechle commit 610019baddcb4c4c323c12cd44ca7f73d7145d6f tree e08e7fbac1f2358b8725a5082ac456d66502d532 parent 9e0c7afd0ec6e6d788df14270b2b1b8f21a384a8 author Ralf Baechle Sat, 17 Jun 2006 14:54:32 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] Remove unused function alloc_pci_controller. Signed-off-by: Ralf Baechle commit 9e0c7afd0ec6e6d788df14270b2b1b8f21a384a8 tree 40ab41d3405e393c94b01b9d863263df94f39744 parent 3a11545615dedd8dd52ff110ddf6e970bfac963a author Ralf Baechle Sat, 17 Jun 2006 00:55:45 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Extract pci_ops into separate file. Signed-off-by: Ralf Baechle commit 3a11545615dedd8dd52ff110ddf6e970bfac963a tree 54f72b728ff5c36d3134d2e18ad69ba4c6801325 parent c340cc504c91cf81561ecca10ec13396ae24dcc0 author Ralf Baechle Sat, 17 Jun 2006 00:46:27 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Use symbolic constants instead of magic numbers. Signed-off-by: Ralf Baechle commit c340cc504c91cf81561ecca10ec13396ae24dcc0 tree aae1bca403ae101ee6c907447be7aa3936e151bc parent f456acae4fe9b4504db7d75c51fba6b8db787ee2 author Yoichi Yuasa Thu, 15 Jun 2006 23:29:37 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. Remove unnecessary items from vr41xx/Kconfig. SYS_HA_CPU_VR41XX has already been selected by MACH_VR41XX. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f456acae4fe9b4504db7d75c51fba6b8db787ee2 tree 0957b407a6ce53a67a3df333a83d24a9d47d3c9b parent 09866258612bd9f389b0d86b3a63fe98e855d3f0 author Ralf Baechle Wed, 14 Jun 2006 08:10:35 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Cleanup N/M mode configuration. Signed-off-by: Ralf Baechle commit 09866258612bd9f389b0d86b3a63fe98e855d3f0 tree 0c6efa03ce82f343d4e6deeed9118a9ebc68aa71 parent d9b8d0da404cf952a425d990c37c29c166eec954 author Ralf Baechle Wed, 14 Jun 2006 08:01:30 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] IP27: Throw away old unused hacks. Signed-off-by: Ralf Baechle commit d9b8d0da404cf952a425d990c37c29c166eec954 tree 22083744b8735c22314f52cd276df35126c8a7b6 parent e53639d8f313974a87540015cbb0832905be6056 author Ralf Baechle Mon, 12 Jun 2006 12:20:09 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] Drop 0 definition for kern_addr_valid kern_addr_valid is currently only being used in kmem_ptr_validate which is making some vague attempt at verfying the validity of an address. Only IA-64, PARISC and x86-64 actually make some actual effort to verify the validity of the pointer. Most architecture definitions of kern_addr_valid() just define it as 1; the Alpha and CONFIG_DISCONTIGMEM on i386 and MIPS even as 0; the 0-definition will result in kmem_ptr_validate always failing which in turn will cause d_validate to always fail. d_validate's only two users are smbfs and ncpfs, so the 0 definition ended breaking those ... Signed-off-by: Ralf Baechle commit e53639d8f313974a87540015cbb0832905be6056 tree b6a442bd408c9c4f2d3de284097d06c69cae273f parent 952fa954a61cee43de5afba91ae605e30ed2586c author Ralf Baechle Mon, 12 Jun 2006 09:13:56 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] Consolidate definitions of pfn_valid in one file. Signed-off-by: Ralf Baechle commit 952fa954a61cee43de5afba91ae605e30ed2586c tree 8d94bd87614cb1c8a7eda02e383c7b6c4f45a474 parent aa9772e330d6c0a8a94316cb38ae8a7495885a60 author Rodolfo Giometti Mon, 05 Jun 2006 17:43:10 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] APM emu support Signed-off-by: Rodolfo Giometti Signed-off-by: Ralf Baechle commit aa9772e330d6c0a8a94316cb38ae8a7495885a60 tree 7371d03f0d86a74eb751d0e262fd562214bf8da5 parent bf5a312b26e9943613b765a29a8de5f4c762df11 author Ralf Baechle Mon, 12 Jun 2006 00:55:14 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE. It's not SN0-specific. Signed-off-by: Ralf Baechle commit bf5a312b26e9943613b765a29a8de5f4c762df11 tree 163a30c499ad6f92f73cbbbd48bfcec73b9a9efc parent d8cb4e119f9a97f87f69a179d855f5dfc5d578c2 author Ralf Baechle Sat, 10 Jun 2006 00:37:20 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] SN: Move FRU header one level up; it is not SN0-specific. Signed-off-by: Ralf Baechle commit d8cb4e119f9a97f87f69a179d855f5dfc5d578c2 tree 65758baf0c2bb77c86d002ec602f4b3c75fa27c9 parent 3e0ba410a5d5595c2b79ecbfb85fb2466b998680 author Ralf Baechle Sun, 11 Jun 2006 23:03:08 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] Cleanup ARCH_DISCONTIGMEM_ENABLE and NUMA configuration. IP27 configuration isn't the only NUMA system - it just happens to be the currently only supported MIPS NUMA system. So move the necessary options back into the main MIPS Kconfig file. Signed-off-by: Ralf Baechle commit 3e0ba410a5d5595c2b79ecbfb85fb2466b998680 tree 22f2044fb6f8c630b02c1c86cc7a96ed017395d0 parent 8f2f360da9262091153c97d756c40eabdde75f1a author Ralf Baechle Wed, 07 Jun 2006 20:13:20 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Remove #if 0'ed code. Signed-off-by: Ralf Baechle commit 8f2f360da9262091153c97d756c40eabdde75f1a tree 057e7afec78f5f2f56e487f4c8dea5d62553a3e6 parent edc123d18397008fcd4fdf04f60e033ba1042834 author Ralf Baechle Wed, 07 Jun 2006 20:10:06 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Nuke leftovers of _STANDALONE Signed-off-by: Ralf Baechle commit edc123d18397008fcd4fdf04f60e033ba1042834 tree 27abf8dda80d61d46c3ee20502e236f1345f77d7 parent 8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f author Ralf Baechle Wed, 07 Jun 2006 20:07:29 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Remove leftovers of sable support. Signed-off-by: Ralf Baechle commit 8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f tree 45f61ecc0a919451d4e4178f3baae69324ed3a22 parent b383f47ec71de66dbba5f7233479783041f5096a author Ralf Baechle Wed, 07 Jun 2006 20:04:23 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Nuke last leftovers from FRUTEST Signed-off-by: Ralf Baechle commit b383f47ec71de66dbba5f7233479783041f5096a tree dec6cffd527d78e03cb784629f438e5208523672 parent 5e46c3aefe60d1398488410a0c39b4cd87738614 author Ralf Baechle Wed, 07 Jun 2006 20:02:21 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO. Signed-off-by: Ralf Baechle commit 5e46c3aefe60d1398488410a0c39b4cd87738614 tree 982f9820e63cee8aacc4a6132f124d1cef4fe901 parent cbb306962ec4b30e03423137e22d605281a8f598 author Ralf Baechle Sun, 04 Jun 2006 15:14:05 -0700 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] C99-ify struct resource initialization. Signed-off-by: Ralf Baechle commit cbb306962ec4b30e03423137e22d605281a8f598 tree 510435da13b336be64eb210f6d2a552503188c43 parent 1bd5e16168b58e73f7be432ba3558af9d38662cf author Ralf Baechle Sun, 04 Jun 2006 00:55:21 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] Remove duplicate declarations from Alchemy code. Signed-off-by: Ralf Baechle commit 1bd5e16168b58e73f7be432ba3558af9d38662cf tree f816acdb0a3a8015c2049c2a7bd1f655e2ec3a15 parent c0589f1ecea73e7bce09c569dca44b83e68a39b1 author Ralf Baechle Sat, 03 Jun 2006 21:59:51 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] Cleanup __emt() a bit. Signed-off-by: Ralf Baechle commit c0589f1ecea73e7bce09c569dca44b83e68a39b1 tree c601141cbcf2f80b28f41c1a27556b764f385540 parent fbd7a38ffb127da53a4c9fd0ad09e6ed937e8e3f author Yoichi Yuasa Wed, 31 May 2006 16:00:05 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Remove unused definitions from addrspace.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit fbd7a38ffb127da53a4c9fd0ad09e6ed937e8e3f tree 2f06c671b67200e181c289949caf4bc08eb2a77e parent b0b0e13e7dd309be13ab9324e67893e62b136e44 author Sergei Shtylyov Sun, 28 May 2006 00:04:01 +0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] arch/mips/au1000/time.c cleanup Mark au1xxx_timer_setup() __init, just because it is. Get rid of unneeded extern's (note that (*do_gettimeoffset)() is already declared by ) and an unused variable. Kill some whitespace... Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit b0b0e13e7dd309be13ab9324e67893e62b136e44 tree 522f2ee785c8ab5600a254cabe8b2d0326425a0c parent c583122c26ad04bb2379933dc5acc8b9479d6c67 author Ralf Baechle Thu, 18 May 2006 12:38:47 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Remove unused instances of prom_build_cpu_map. Signed-off-by: Ralf Baechle commit c583122c26ad04bb2379933dc5acc8b9479d6c67 tree 8afc9153e18b300ab93ff6a675e0c0f6e464c518 parent eae89076e696f51762d81d6e2538c3beb59fa7bd author Thiemo Seufer Mon, 15 May 2006 18:59:34 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Qemu system shutdown support Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit eae89076e696f51762d81d6e2538c3beb59fa7bd tree 7aab0972d6786721eb6c9b01d77a1b5f13263c49 parent 5deee2dbf495b2693629f7e8f846483432096278 author Atsushi Nemoto Tue, 16 May 2006 01:26:03 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs. The struct mips_fpu_soft_struct and mips_fpu_hard_struct are completely same now and the kernel fpu emulator assumes that. This patch unifies them to mips_fpu_struct and get rid of mips_fpu_union. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5deee2dbf495b2693629f7e8f846483432096278 tree 8ab697ac6c3217a60a93e56e88df482230eb2f77 parent a240a469649eaab03f0c4c7fbb21ea5041bf5572 author Ralf Baechle Mon, 15 May 2006 15:08:22 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Remove prototype for non-existing function. Signed-off-by: Ralf Baechle commit a240a469649eaab03f0c4c7fbb21ea5041bf5572 tree 71801adbf35a8a449a76398a4a5d7c34066313b4 parent a643d2b57403dc943fd4d9a3c803addd1c6b0ddc author Mark.Zhan Sat, 06 May 2006 17:04:20 +0800 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Wind River 4KC PPMC Eval Board Support Support for the GT-64120-based Wind River 4KC PPMC Evaluation board. Signed-off-by: Rongkai.Zhan Signed-off-by: Ralf Baechle commit a643d2b57403dc943fd4d9a3c803addd1c6b0ddc tree c06e22a97cffe9f700874fba938eceb6226e50e8 parent 3c0094426f3ff37697062b940211712746419688 author Herbert Valerio Riedel Sun, 07 May 2006 15:48:25 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] Au1xxx: board specific irq code cleanup Convert sizeof/sizeof use to use of ARRAY_SIZE macro, and annotate irqmap structures as __initdata. Signed-off-by: Herbert Valerio Riedel Signed-off-by: Ralf Baechle commit 3c0094426f3ff37697062b940211712746419688 tree 9cf7f61829a9ac03294bc04e9b00257a17c2d2d9 parent 0307e8d024dffc00743fb54b9afa920a346f1adb author Ralf Baechle Fri, 16 Jun 2006 17:10:49 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] IP27: Fix collision with hardcoded interrupt number. Signed-off-by: Ralf Baechle commit 0307e8d024dffc00743fb54b9afa920a346f1adb tree 3e6ea1c677105501fc9efb57105cb23cec4e8f2d parent e1701fb2e2f3c02760684e26007e3379be23b690 author Atsushi Nemoto Sun, 11 Jun 2006 23:25:43 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] Fix futex_atomic_op_inuser. I found that NPTL's pthread_cond_signal() does not work properly on kernels compiled by gcc 4.1.x. I suppose inline asm for __futex_atomic_op() was wrong. I suppose: 1. "=&r" constraint should be used for oldval. 2. Instead of "r" (uaddr), "=R" (*uaddr) for output and "R" (*uaddr) for input should be used. 3. "memory" should be added to the clobber list. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit e1701fb2e2f3c02760684e26007e3379be23b690 tree ed27a4aa460a0fa5ae0a928e2dd86de0e555bd68 parent 4b29f6043dbb07823a0a618fb8b35ef3ac83e759 author [MIPS] James E Wilson Mon, 27 Feb 2006 15:04:38 -0800 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [PATCH] Fix BCM1480 doubled process accounting times. Running a UP kernel on a bcm1480 board, I get nonsensical timing results, like this: release@unknown:~/tmp$ time ./a.out real 0m22.906s user 0m45.792s sys 0m0.010s According to my watch, this program took 23 seconds to run, so the real time clock is OK. It is process accounting that is broken. I tracked this down to a problem with the function bcm1480_timer_interrupt in the file sibyte/bcm1480/time.c. This function calls ll_timer_interrupt for cpu0, and ll_local_timer_interrupt for all cpus. However, both of these functions do process accounting. Thus processes running on cpu0 end up with doubled times. This is very obvious in a UP kernel where all processes run on cpu0. The correct way to do this is to only call ll_local_timer interrupt if this is not cpu0. This can be seen in the mips-board/generic/time.c file, and also in the sibyte/sb1250/time.c file, both of which handle this correctly. I fixed the bcm1480/time.c file by copying over the correct code from the sb1250/time.c file. With this fix, I now get sensible results. release@unknown:~/tmp$ time ./a.out real 0m22.903s user 0m22.894s sys 0m0.006s Signed-off-by: Ralf Baechle commit 4b29f6043dbb07823a0a618fb8b35ef3ac83e759 tree 60958a8df2a8b5e5cadb0df225753d5500a95f95 parent 72fbfb260197a52c2bc2583f3e8f15d261d0f924 author Ralf Baechle Wed, 07 Jun 2006 15:24:44 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [MIPS] Mark PNX8550 support broken. Broken in too many way for me to fix it for 2.6.17. Signed-off-by: Ralf Baechle commit 72fbfb260197a52c2bc2583f3e8f15d261d0f924 tree 4801ed07d35013ece68ed9ca40f40421ff8f5e2a parent aac076f8805448a6331a526aa02cc438730ddd39 author Ralf Baechle Wed, 07 Jun 2006 13:25:37 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [MIPS] Fix optimization for size build. It took a while longer than on other architectures but gcc has finally started to strike us as well ... This also fixes the damage by 6edfba1b33c701108717f4e036320fc39abe1912. Signed-off-by: Ralf Baechle commit aac076f8805448a6331a526aa02cc438730ddd39 tree 270ad4de03c5cf88e6a267335ac4888dcce09854 parent 973c789742b4dc957cd7feb96cae98988dd0cf01 author Ralf Baechle Wed, 07 Jun 2006 12:53:17 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:15 +0100 [MIPS] IP22: Fix ISA driver builds if CONFIG_EISA is selected. Signed-off-by: Ralf Baechle commit 973c789742b4dc957cd7feb96cae98988dd0cf01 tree f9a78f2c8fccf4b9be408eddf365d7fb68950743 parent c138e12f3a2e0421a4c8edf02587d2d394418679 author Yoichi Yuasa Wed, 07 Jun 2006 09:53:34 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:14 +0100 [MIPS] Cobalt: Fix undefined reference to disable_early_printk. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit c138e12f3a2e0421a4c8edf02587d2d394418679 tree 66abbf27cbfc9030958b469aa4d826242417a752 parent 734996820fd02b52a3fa0fcc09bdb914934bea4c author Atsushi Nemoto Tue, 23 May 2006 00:47:41 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:13 +0100 [MIPS] Fix fpu_save_double on 64-bit. > Without this fix, _save_fp() in 64-bit kernel is seriously broken. > > ffffffff8010bec0 <_save_fp>: > ffffffff8010bec0: 400d6000 mfc0 t1,c0_status > ffffffff8010bec4: 000c7140 sll t2,t0,0x5 > ffffffff8010bec8: 05c10011 bgez t2,ffffffff8010bf10 <_save_fp+0x50> > ffffffff8010becc: 00000000 nop > ffffffff8010bed0: f4810328 sdc1 $f1,808(a0) > ... Fix register usage in fpu_save_double() and make fpu_restore_double() more symmetric with fpu_save_double(). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 734996820fd02b52a3fa0fcc09bdb914934bea4c tree 7d12e625c842bfc605b83506fd2423a44fad53ed parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Elizabeth Oldham Tue, 06 Jun 2006 10:57:09 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:13 +0100 [MIPS] Malta: Handle byteswapping hardare bug in big endian mode. The SOC-it system controller running in big endian mode might forget byteswapping when DMAing to the last word of physical memory. Fixed by ignoring the last page of memory. Signed-off-by: Ralf Baechle commit 2abac1db3522d9f56c695d1b42e77f3e52d4c51a tree e1a93a13f8dfb44dd5018e5dda2b074304baadac parent 72109368de7aaa5d489d9ca4641f4a11a6fc7653 author Dave Airlie Sun, 18 Jun 2006 16:12:27 +1000 committer Dave Airlie Sun, 18 Jun 2006 16:12:27 +1000 intelfb: fixup clock calculation debugging. The debugging code for pll clocks was wrong and causing div by 0. Signed-off-by: Dave Airlie commit 47552c4e555eefe381f3d45140b59a2ea4b16486 tree 674bb6f7371745fd49404f635404cea14af70f45 parent d5b9f4c083b0e3102f3101545279f623680cb3a0 author Herbert Xu Sat, 17 Jun 2006 23:00:20 -0700 committer David S. Miller Sat, 17 Jun 2006 23:00:20 -0700 [ETHTOOL]: Fix UFO typo The function ethtool_get_ufo was referring to ETHTOOL_GTSO instead of ETHTOOL_GUFO. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d5b9f4c083b0e3102f3101545279f623680cb3a0 tree 86d5f77d14a8ae687e585ec4535ca8038e450ab9 parent d7c2c9e3977e4312d093ac092761798d4d47c9e0 author Neil Horman Sat, 17 Jun 2006 22:59:03 -0700 committer David S. Miller Sat, 17 Jun 2006 22:59:03 -0700 [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. In the event that our entire receive buffer is full with a series of chunks that represent a single gap-ack, and then we accept a chunk (or chunks) that fill in the gap between the ctsn and the first gap, we renege chunks from the end of the buffer, which effectively does nothing but move our gap to the end of our received tsn stream. This does little but move our missing tsns down stream a little, and, if the sender is sending sufficiently large retransmit frames, the result is a perpetual slowdown which can never be recovered from, since the only chunk that can be accepted to allow progress in the tsn stream necessitates that a new gap be created to make room for it. This leads to a constant need for retransmits, and subsequent receiver stalls. The fix I've come up with is to deliver the frame without reneging if we have a full receive buffer and the receiving sockets sk_receive_queue is empty(indicating that the receive buffer is being blocked by a missing tsn). Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit d7c2c9e3977e4312d093ac092761798d4d47c9e0 tree 1228ed1e6729f8dd6069698e9221ac35790cf0c5 parent 503b55fd77d11381b1950d1651d3bc782c0cc2cd author Tsutomu Fujii Sat, 17 Jun 2006 22:58:28 -0700 committer David S. Miller Sat, 17 Jun 2006 22:58:28 -0700 [SCTP]: Send only 1 window update SACK per message. Right now, every time we increase our rwnd by more then MTU bytes, we trigger a SACK. When processing large messages, this will generate a SACK for almost every other SCTP fragment. However since we are freeing the entire message at the same time, we might as well collapse the SACK generation to 1. Signed-off-by: Tsutomu Fujii Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 503b55fd77d11381b1950d1651d3bc782c0cc2cd tree a960542bcc10b97218a601a94e56e579595c0a2c parent 4c9f5d5305a23851e67471b147e0d459a7166717 author Sridhar Samudrala Sat, 17 Jun 2006 22:57:28 -0700 committer David S. Miller Sat, 17 Jun 2006 22:57:28 -0700 [SCTP]: Don't do CRC32C checksum over loopback. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 4c9f5d5305a23851e67471b147e0d459a7166717 tree 6cacecfa0b61248b996dfe54d1f944c5bab32d6d parent 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 author Vlad Yasevich Sat, 17 Jun 2006 22:56:08 -0700 committer David S. Miller Sat, 17 Jun 2006 22:56:08 -0700 [SCTP] Reset rtt_in_progress for the chunk when processing its sack. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 tree b5e9e42560ba86ffbbd63a582df87844996b6d03 parent 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c author Vlad Yasevich Sat, 17 Jun 2006 22:55:35 -0700 committer David S. Miller Sat, 17 Jun 2006 22:55:35 -0700 [SCTP]: Reject sctp packets with broadcast addresses. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c tree a493d4130e07f14e29e89cc746a59475cbb073f4 parent c7ce1ae21223fe1f905feba272bc14b87994a57d author Vlad Yasevich Sat, 17 Jun 2006 22:54:51 -0700 committer David S. Miller Sat, 17 Jun 2006 22:54:51 -0700 [SCTP]: Limit association max_retrans setting in setsockopt. When using ASSOCINFO socket option, we need to limit the number of maximum association retransmissions to be no greater than the sum of all the path retransmissions. This is specified in Section 7.1.2 of the SCTP socket API draft. However, we only do this if the association has multiple paths. If there is only one path, the protocol stack will use the assoc_max_retrans setting when trying to retransmit packets. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit c7ce1ae21223fe1f905feba272bc14b87994a57d tree cd527489396fd9def8d19416fd05c2c11f794394 parent c5396a31b20991c856facbce18a2a56d1a14e8d0 author Tushar Gohad Sat, 17 Jun 2006 22:54:03 -0700 committer David S. Miller Sat, 17 Jun 2006 22:54:03 -0700 [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. Signed-off-by: Tushar Gohad Signed-off-by: David S. Miller commit c5396a31b20991c856facbce18a2a56d1a14e8d0 tree 39213f3e9cabee6ba2ffe7440a7a4efef8a1e033 parent b293acfd3133393a81bcd382eb71a210c9cf9526 author YOSHIFUJI Hideaki Sat, 17 Jun 2006 22:48:48 -0700 committer David S. Miller Sat, 17 Jun 2006 22:48:48 -0700 [IPV6]: Sum real space for RTAs. This patch fixes RTNLGRP_IPV6_IFINFO netlink notifications. Issue pointed out by Patrick McHardy . Signed-off-by: YOSHIFUJI Hideaki Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a tree df99b49818371ee6dcdbfedaee66f457dafc3a68 parent b5ed7639c9f502898af4109e778f5613dacbfd9c parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Jeff Garzik Sun, 18 Jun 2006 01:22:42 -0400 committer Jeff Garzik Sun, 18 Jun 2006 01:22:42 -0400 Merge branch 'master' into upstream commit b293acfd3133393a81bcd382eb71a210c9cf9526 tree 0b940bd69064a6fafa725d442ce6d93ebbe5254c parent 2c6cc0d8539f121c3c75aa3641c19b67e8723379 author David S. Miller Sat, 17 Jun 2006 22:16:13 -0700 committer David S. Miller Sat, 17 Jun 2006 22:16:13 -0700 [IRDA]: Use put_unaligned() in irlmp_do_discovery(). irda_device_info->hints[] is byte aligned but is being accessed as a u16 Based upon a patch by Luke Yang . Signed-off-by: David S. Miller commit 2c6cc0d8539f121c3c75aa3641c19b67e8723379 tree dbc8cc8a5b3fd83734dc6b80b614136e663a017e parent 8648b3053bff39a7ee4c711d74268079c928a657 author Herbert Xu Sat, 17 Jun 2006 22:06:45 -0700 committer David S. Miller Sat, 17 Jun 2006 22:06:45 -0700 [BRIDGE]: Add support for NETIF_F_HW_CSUM devices As it is the bridge will only ever declare NETIF_F_IP_CSUM even if all its constituent devices support NETIF_F_HW_CSUM. This patch fixes this by supporting the first one out of NETIF_F_NO_CSUM, NETIF_F_HW_CSUM, and NETIF_F_IP_CSUM that is supported by all constituent devices. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8648b3053bff39a7ee4c711d74268079c928a657 tree 6de70eedf63c4b965d04040323827f1bc520ccdf parent 00b7050426da8e7e58c889c5c80a19920d2d41b3 author Herbert Xu Sat, 17 Jun 2006 22:06:05 -0700 committer David S. Miller Sat, 17 Jun 2006 22:06:05 -0700 [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM The current stack treats NETIF_F_HW_CSUM and NETIF_F_NO_CSUM identically so we test for them in quite a few places. For the sake of brevity, I'm adding the macro NETIF_F_GEN_CSUM for these two. We also test the disjunct of NETIF_F_IP_CSUM and the other two in various places, for that purpose I've added NETIF_F_ALL_CSUM. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 00b7050426da8e7e58c889c5c80a19920d2d41b3 tree 55a07464fdf81b23fced966feca2b041af77c6f6 parent c71302d61f844f766a44e1b04258086cc41f624e author Michael Chan Sat, 17 Jun 2006 21:58:45 -0700 committer David S. Miller Sat, 17 Jun 2006 21:58:45 -0700 [TG3]: Convert to non-LLTX Herbert Xu pointed out that it is unsafe to call netif_tx_disable() from LLTX drivers because it uses dev->xmit_lock to synchronize whereas LLTX drivers use private locks. Convert tg3 to non-LLTX to fix this issue. tg3 is a lockless driver where hard_start_xmit and tx completion handling can run concurrently under normal conditions. A tx_lock is only needed to prevent netif_stop_queue and netif_wake_queue race condtions when the queue is full. So whether we use LLTX or non-LLTX, it makes practically no difference. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c71302d61f844f766a44e1b04258086cc41f624e tree 678780353e025222ce87667466bba599c4c21d97 parent 35089bb203f44e33b6bbb6c4de0b0708f9a48921 author Michael Chan Sat, 17 Jun 2006 21:55:55 -0700 committer David S. Miller Sat, 17 Jun 2006 21:55:55 -0700 [TG3]: Remove unnecessary tx_lock Remove tx_lock where it is unnecessary. tg3 runs lockless and so it requires interrupts to be disabled and sync'ed, netif_queue and NAPI poll to be stopped before the device can be reconfigured. After stopping everything, it is no longer necessary to get the tx_lock. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 35089bb203f44e33b6bbb6c4de0b0708f9a48921 tree 3e9ca3dbc12a063121c3ecba2558400307d4acd5 parent 9e1881dec9e3e8f8408551cddfda489857a7ec99 author David S. Miller Tue, 13 Jun 2006 22:33:04 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:53 -0700 [TCP]: Add tcp_slow_start_after_idle sysctl. A lot of people have asked for a way to disable tcp_cwnd_restart(), and it seems reasonable to add a sysctl to do that. Signed-off-by: David S. Miller commit 9e1881dec9e3e8f8408551cddfda489857a7ec99 tree 2b4b131ee096e2ad604117d14a85cbd49c7090e5 parent c86a31f452f7dd132a1765d6d7160b0947f37b14 author Michael Chan Tue, 13 Jun 2006 15:04:12 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:51 -0700 [BNX2]: Update version and reldate Update driver version to 1.4.42. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c86a31f452f7dd132a1765d6d7160b0947f37b14 tree b531650af625d24958bb59b511a1e4157525dc1e parent 7a6400cd3dbcfc3bbffcdb6dac4ffc957fb50e19 author Michael Chan Tue, 13 Jun 2006 15:03:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:49 -0700 [BNX2]: Use CPU native page size Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems. Added check to limit the page size to 16K since that's the maximum rx ring size that will be used. This will prevent using unnecessarily large page sizes on some architectures with large page sizes. [Suggested by David Miller] Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7a6400cd3dbcfc3bbffcdb6dac4ffc957fb50e19 tree 521d780caa40ccf034c4f612cdd0c916f146a96b parent fba9fe911bb4213c3de1d142fe0ee127cd361a78 author Michael Chan Mon, 12 Jun 2006 22:22:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:47 -0700 [BNX2]: Use compressed firmware Change bnx2_fw.h to use compressed text for all CPU images. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fba9fe911bb4213c3de1d142fe0ee127cd361a78 tree 2fc7a68e612644cc8ce3ff8e44f210e20f6964b4 parent 160882722cb21cbe5cead55cf38a5e70fc3af63e author Michael Chan Mon, 12 Jun 2006 22:21:25 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:44 -0700 [BNX2]: Add firmware decompression Add functions to decompress firmware before loading to the internal CPUs. Compressing the firmware reduces the driver size significantly. Added file name length sanity check in the gzip header to prevent going past the end of buffer [suggested by DaveM]. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 160882722cb21cbe5cead55cf38a5e70fc3af63e tree 76753321be54ae173132df788cece79a12651901 parent cea94db9b496d7fe25bbd3ebd0f24afaac2069d5 author Michael Chan Mon, 12 Jun 2006 22:16:43 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:42 -0700 [BNX2]: Allow WoL settings on new 5708 chips Allow WOL settings on 5708 B2 and newer chips that have the problem fixed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cea94db9b496d7fe25bbd3ebd0f24afaac2069d5 tree e425453a1f5fcc28c4db9c750f825161a58d03ac parent bc726a71d2799f0f8b68a17f49d86aa030f64abc author Michael Chan Mon, 12 Jun 2006 22:16:13 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:40 -0700 [BNX2]: Add an rx drop counter Add a counter for packets dropped by firmware. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit bc726a71d2799f0f8b68a17f49d86aa030f64abc tree d16e9cc28069700c8f0a7cc8878ef04edab2206e parent b3a92eabe5b67bd207a38ae13dd51f4e08c1f6f7 author Luca De Cicco Sun, 11 Jun 2006 23:02:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:38 -0700 [TCP] Westwood: reset RTT min after FRTO RTT_min is updated each time a timeout event occurs in order to cope with hard handovers in wireless scenarios such as UMTS. Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b3a92eabe5b67bd207a38ae13dd51f4e08c1f6f7 tree 511472b1fb5e71e810dd73c9d8b11c12d9aa0efe parent b7d7a9e3c900f0733bf2aabdd41e6dbc70eae94b author Luca De Cicco Sun, 11 Jun 2006 23:01:59 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:36 -0700 [TCP] Westwood: bandwidth filter startup The bandwidth estimate filter is now initialized with the first sample in order to have better performances in the case of small file transfers. Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b7d7a9e3c900f0733bf2aabdd41e6dbc70eae94b tree fa8d5b51f68ea0decac901026f7f6d6648d75614 parent f61e29018a30c738e1298e1b13be956aa17ee17b author Luca De Cicco Sun, 11 Jun 2006 23:01:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:34 -0700 [TCP] Westwood: comment fixes Cleanup some comments and add more references Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f61e29018a30c738e1298e1b13be956aa17ee17b tree 1ea51ae6fd477d9e3271d8eb8b2cec24f6fa39b2 parent bdeb04c6d9a957ae2a51c3033414467b82b2a736 author Stephen Hemminger Sun, 11 Jun 2006 23:01:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:32 -0700 [TCP] Westwood: fix first sample Need to update send sequence number tracking after first ack. Rework of patch from Luca De Cicco. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bdeb04c6d9a957ae2a51c3033414467b82b2a736 tree 7e457169cd43dc8367067bff23f1b3fad6eb98b2 parent d1e100ba69131bb788e89a07b94b08f6e006725a author Stephen Hemminger Sun, 11 Jun 2006 21:20:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:30 -0700 [NET]: net.ipv4.ip_autoconfig sysctl removal The sysctl net.ipv4.ip_autoconfig is a legacy value that is not used. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d1e100ba69131bb788e89a07b94b08f6e006725a tree 8ece0a94f8920803b8a36e6ecdce7d0196e978d3 parent 8ef80aef118e405f2b6505f623830e6e73224f85 author Alexey Dobriyan Sun, 11 Jun 2006 20:57:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:28 -0700 [BNX2]: Endian fixes. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 8ef80aef118e405f2b6505f623830e6e73224f85 tree 6abecac69d73eb3ffb884e29eb6ecc3c1d39cb7e parent f8d596211291a8d98efa47ae0261326218f310cf author Nick Fedchik Sun, 11 Jun 2006 20:56:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:26 -0700 [IRDA]: irda-usb.c: STIR421x cleanups This cleans the STIR421x part of the irda-usb code. We also no longer try to load all existing firmwares but only the matching one (according to the USB id we get from the dongle). Signed-off-by: Nick Fedchik Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit f8d596211291a8d98efa47ae0261326218f310cf tree 957501662f985e72ab2ec6f086bc9feefb9e6a60 parent 3cc0e873986fe594d0e96d07259b11f755325cb2 author Alexey Dobriyan Sat, 10 Jun 2006 18:05:35 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:24 -0700 [IPX]: Endian bug in ipxrtr_route_packet() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 3cc0e873986fe594d0e96d07259b11f755325cb2 tree 5d3e9a57333a2d7088a6a63c09bc97db98f480af parent b38dfee3d616ffadb58d4215e3ff9d1d7921031e author Herbert Xu Fri, 09 Jun 2006 16:13:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:22 -0700 [NET]: Warn in __skb_trim if skb is paged It's better to warn and fail rather than rarely triggering BUG on paths that incorrectly call skb_trim/__skb_trim on a non-linear skb. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b38dfee3d616ffadb58d4215e3ff9d1d7921031e tree 55ae104c8522e973291f490c9902580de798ae93 parent c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 author Herbert Xu Fri, 09 Jun 2006 16:13:01 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:20 -0700 [NET]: skb_trim audit I found a few more spots where pskb_trim_rcsum could be used but were not. This patch changes them to use it. Also, sk_filter can get paged skb data. Therefore we must use pskb_trim instead of skb_trim. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 tree 18cb4685232e030518d637fa7496a95bc69fc6d8 parent 364c6badde0dd62a0a38e5ed67f85d87d6665780 author Herbert Xu Fri, 09 Jun 2006 16:11:27 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:18 -0700 [NET] ppp: Remove unnecessary pskb_may_pull In ppp_receive_nonmp_frame, we call pskb_may_pull(skb, skb->len) if the tailroom is >= 124. This is pointless because this pskb_may_pull is only needed if the skb is non-linear. However, if it is non-linear then the tailroom would be zero. So it can be safely removed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 364c6badde0dd62a0a38e5ed67f85d87d6665780 tree 56c8ad3e3f45fafec010da4f5858825db5dbc86c parent 932ff279a43ab7257942cddff2595acd541cc49b author Herbert Xu Fri, 09 Jun 2006 16:10:40 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:16 -0700 [NET]: Clean up skb_linearize The linearisation operation doesn't need to be super-optimised. So we can replace __skb_linearize with __pskb_pull_tail which does the same thing but is more general. Also, most users of skb_linearize end up testing whether the skb is linear or not so it helps to make skb_linearize do just that. Some callers of skb_linearize also use it to copy cloned data, so it's useful to have a new function skb_linearize_cow to copy the data if it's either non-linear or cloned. Last but not least, I've removed the gfp argument since nobody uses it anymore. If it's ever needed we can easily add it back. Misc bugs fixed by this patch: * via-velocity error handling (also, no SG => no frags) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 932ff279a43ab7257942cddff2595acd541cc49b tree e60130673a20d71becdac858c2589d8dfbf3ae1f parent bf0857ea32addb6bc8b46383604b218b8ec09f19 author Herbert Xu Fri, 09 Jun 2006 12:20:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:14 -0700 [NET]: Add netif_tx_lock Various drivers use xmit_lock internally to synchronise with their transmission routines. They do so without setting xmit_lock_owner. This is fine as long as netpoll is not in use. With netpoll it is possible for deadlocks to occur if xmit_lock_owner isn't set. This is because if a printk occurs while xmit_lock is held and xmit_lock_owner is not set can cause netpoll to attempt to take xmit_lock recursively. While it is possible to resolve this by getting netpoll to use trylock, it is suboptimal because netpoll's sole objective is to maximise the chance of getting the printk out on the wire. So delaying or dropping the message is to be avoided as much as possible. So the only alternative is to always set xmit_lock_owner. The following patch does this by introducing the netif_tx_lock family of functions that take care of setting/unsetting xmit_lock_owner. I renamed xmit_lock to _xmit_lock to indicate that it should not be used directly. I didn't provide irq versions of the netif_tx_lock functions since xmit_lock is meant to be a BH-disabling lock. This is pretty much a straight text substitution except for a small bug fix in winbond. It currently uses netif_stop_queue/spin_unlock_wait to stop transmission. This is unsafe as an IRQ can potentially wake up the queue. So it is safer to use netif_tx_disable. The hamradio bits used spin_lock_irq but it is unnecessary as xmit_lock must never be taken in an IRQ handler. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bf0857ea32addb6bc8b46383604b218b8ec09f19 tree 84b92a237f4f5e538f401dcbcc2725c75cc06955 parent 2b2283d0302d520f08ded41c2ca17886dfbb865a author Patrick McHardy Fri, 09 Jun 2006 12:18:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:11 -0700 [NETFILTER]: hashlimit match: fix random initialization hashlimit does: if (!ht->rnd) get_random_bytes(&ht->rnd, 4); ignoring that 0 is also a valid random number. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2b2283d0302d520f08ded41c2ca17886dfbb865a tree 35b8cfa9a50107a73b6e47552eae433133f16931 parent a0e889bb1bdc083dbbdb02cce9698765847b841f author Patrick McHardy Fri, 09 Jun 2006 12:18:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:09 -0700 [NETFILTER]: recent match: missing refcnt initialization Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a0e889bb1bdc083dbbdb02cce9698765847b841f tree 3f176b4be0d7821f7104303f856839579deb0091 parent 4e5ab4cb85683cf77b507ba0c4d48871e1562305 author Patrick McHardy Fri, 09 Jun 2006 12:17:41 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:07 -0700 [NETFILTER]: recent match: fix "sleeping function called from invalid context" create_proc_entry must not be called with locks held. Use a mutex instead to protect data only changed in user context. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4e5ab4cb85683cf77b507ba0c4d48871e1562305 tree aef7ba8b6050fcaccbaf0d05f8e5ba860a143eaf parent 100468e9c05c10fb6872751c1af523b996d6afa9 author James Morris Fri, 09 Jun 2006 00:33:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:05 -0700 [SECMARK]: Add new packet controls to SELinux Add new per-packet access controls to SELinux, replacing the old packet controls. Packets are labeled with the iptables SECMARK and CONNSECMARK targets, then security policy for the packets is enforced with these controls. To allow for a smooth transition to the new controls, the old code is still present, but not active by default. To restore previous behavior, the old controls may be activated at runtime by writing a '1' to /selinux/compat_net, and also via the kernel boot parameter selinux_compat_net. Switching between the network control models requires the security load_policy permission. The old controls will probably eventually be removed and any continued use is discouraged. With this patch, the new secmark controls for SElinux are disabled by default, so existing behavior is entirely preserved, and the user is not affected at all. It also provides a config option to enable the secmark controls by default (which can always be overridden at boot and runtime). It is also noted in the kconfig help that the user will need updated userspace if enabling secmark controls for SELinux and that they'll probably need the SECMARK and CONNMARK targets, and conntrack protocol helpers, although such decisions are beyond the scope of kernel configuration. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 100468e9c05c10fb6872751c1af523b996d6afa9 tree 2ad0e988897a3636cbe5353a7624232c62b0968a parent 7c9728c393dceb724d66d696cfabce82151a78e5 author James Morris Fri, 09 Jun 2006 00:32:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:03 -0700 [SECMARK]: Add CONNSECMARK xtables target Add a new xtables target, CONNSECMARK, which is used to specify rules for copying security marks from packets to connections, and for copyying security marks back from connections to packets. This is similar to the CONNMARK target, but is more limited in scope in that it only allows copying of security marks to and from packets, as this is all it needs to do. A typical scenario would be to apply a security mark to a 'new' packet with SECMARK, then copy that to its conntrack via CONNMARK, and then restore the security mark from the connection to established and related packets on that connection. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7c9728c393dceb724d66d696cfabce82151a78e5 tree af2b67ff7c579d669d01f28af33929f780b9c1b3 parent 5e6874cdb8de94cd3c15d853a8ef9c6f4c305055 author James Morris Fri, 09 Jun 2006 00:31:46 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:01 -0700 [SECMARK]: Add secmark support to conntrack Add a secmark field to IP and NF conntracks, so that security markings on packets can be copied to their associated connections, and also copied back to packets as required. This is similar to the network mark field currently used with conntrack, although it is intended for enforcement of security policy rather than network policy. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5e6874cdb8de94cd3c15d853a8ef9c6f4c305055 tree 3f289088db7512d55d6e46d1d14c5d18f07f9b4f parent 984bc16cc92ea3c247bf34ad667cfb95331b9d3c author James Morris Fri, 09 Jun 2006 00:30:57 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:59 -0700 [SECMARK]: Add xtables SECMARK target Add a SECMARK target to xtables, allowing the admin to apply security marks to packets via both iptables and ip6tables. The target currently handles SELinux security marking, but can be extended for other purposes as needed. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 984bc16cc92ea3c247bf34ad667cfb95331b9d3c tree 2342638457f43980501179056f4ba1e4e3c2c1aa parent c749b29fae74ed59c507d84025b3298202b42609 author James Morris Fri, 09 Jun 2006 00:29:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:57 -0700 [SECMARK]: Add secmark support to core networking. Add a secmark field to the skbuff structure, to allow security subsystems to place security markings on network packets. This is similar to the nfmark field, except is intended for implementing security policy, rather than than networking policy. This patch was already acked in principle by Dave Miller. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c749b29fae74ed59c507d84025b3298202b42609 tree c06b1fb17cce425692f7ab40b2df8c5b00d8c931 parent 29a395eac4c320c570e73f0a90d8953d80da8359 author James Morris Fri, 09 Jun 2006 00:28:25 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:55 -0700 [SECMARK]: Add SELinux exports Add and export new functions to the in-kernel SELinux API in support of the new secmark-based packet controls. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 29a395eac4c320c570e73f0a90d8953d80da8359 tree 9d34d7987754004e76de76d3f9facbee804779b7 parent 3e3ff15e6d8ba931fa9a6c7f9fe711edc77e96e5 author James Morris Fri, 09 Jun 2006 00:27:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:53 -0700 [SECMARK]: Add new flask definitions to SELinux Secmark implements a new scheme for adding security markings to packets via iptables, as well as changes to SELinux to use these markings for security policy enforcement. The rationale for this scheme is explained and discussed in detail in the original threads: http://thread.gmane.org/gmane.linux.network/34927/ http://thread.gmane.org/gmane.linux.network/35244/ Examples of policy and rulesets, as well as a full archive of patches for iptables and SELinux userland, may be found at: http://people.redhat.com/jmorris/selinux/secmark/ The code has been tested with various compilation options and in several scenarios, including with 'complicated' protocols such as FTP and also with the new generic conntrack code with IPv6 connection tracking. This patch: Add support for a new object class ('packet'), and associated permissions ('send', 'recv', 'relabelto'). These are used to enforce security policy for network packets labeled with SECMARK, and for adding labeling rules. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3e3ff15e6d8ba931fa9a6c7f9fe711edc77e96e5 tree e3b3edcf5092e9533539f6e8abdda83eee2cb96d parent 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 author Christopher J. PeBenito Fri, 09 Jun 2006 00:25:03 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:51 -0700 [SELINUX]: add security class for appletalk sockets Add a security class for appletalk sockets so that they can be distinguished in SELinux policy. Please apply. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 tree 7d0be960b8c0ec5b947637a0650f1c639002103a parent 9dadaa19cb11a8db38072a92a3f95deab7a797fb author David S. Miller Thu, 08 Jun 2006 23:58:52 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:49 -0700 [NET]: Fix warnings after LSM-IPSEC changes. Assignment used as truth value in xfrm_del_sa() and xfrm_get_policy(). Wrong argument type declared for security_xfrm_state_delete() when SELINUX is disabled. Signed-off-by: David S. Miller commit 9dadaa19cb11a8db38072a92a3f95deab7a797fb tree 30a173768a0a84194c89898ecba1cb2a1bd49619 parent c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63 author Dave Jones Thu, 08 Jun 2006 23:42:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:47 -0700 [NET]: NET_TCPPROBE Kconfig fix Just spotted this typo in a new option. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63 tree b4a04dd9e2b940cb5b2911fb67fbe49c5f8b3fbf parent cec6f7f39c3db7d9f6091bf2f8fc8d520f372719 author Catherine Zhang Thu, 08 Jun 2006 23:39:49 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:45 -0700 [LSM-IPsec]: SELinux Authorize This patch contains a fix for the previous patch that adds security contexts to IPsec policies and security associations. In the previous patch, no authorization (besides the check for write permissions to SAD and SPD) is required to delete IPsec policies and security assocations with security contexts. Thus a user authorized to change SAD and SPD can bypass the IPsec policy authorization by simply deleteing policies with security contexts. To fix this security hole, an additional authorization check is added for removing security policies and security associations with security contexts. Note that if no security context is supplied on add or present on policy to be deleted, the SELinux module allows the change unconditionally. The hook is called on deletion when no context is present, which we may want to change. At present, I left it up to the module. LSM changes: The patch adds two new LSM hooks: xfrm_policy_delete and xfrm_state_delete. The new hooks are necessary to authorize deletion of IPsec policies that have security contexts. The existing hooks xfrm_policy_free and xfrm_state_free lack the context to do the authorization, so I decided to split authorization of deletion and memory management of security data, as is typical in the LSM interface. Use: The new delete hooks are checked when xfrm_policy or xfrm_state are deleted by either the xfrm_user interface (xfrm_get_policy, xfrm_del_sa) or the pfkey interface (pfkey_spddelete, pfkey_delete). SELinux changes: The new policy_delete and state_delete functions are added. Signed-off-by: Catherine Zhang Signed-off-by: Trent Jaeger Acked-by: James Morris Signed-off-by: David S. Miller commit cec6f7f39c3db7d9f6091bf2f8fc8d520f372719 tree 08142a001fa9b010056202293697c7b5aea6bae8 parent f86502bfc177f69bbabbedb78ebf710579ae0e54 author Andreas Schwab Mon, 05 Jun 2006 21:21:57 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:43 -0700 [CONNECTOR]: Fix warning in cn_queue.c cn_queue.c:130: warning: value computed is not used There is no point in testing the atomic value if the result is thrown away. From Evgeniy: It was created to put implicit smp barrier, but it is not needed there. Signed-off-by: Andreas Schwab Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit f86502bfc177f69bbabbedb78ebf710579ae0e54 tree 07a1551eb832f1c7c437c2d959f44d68e7c24a6a parent 6d7416535097ed0943bdae8e69c14ba43061cab1 author David S. Miller Mon, 05 Jun 2006 21:19:24 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:41 -0700 [IPV4] icmp: Kill local 'ip' arg in icmp_redirect(). It is typed wrong, and it's only assigned and used once. So just pass in iph->daddr directly which fixes both problems. Based upon a patch by Alexey Dobriyan. Signed-off-by: David S. Miller commit 6d7416535097ed0943bdae8e69c14ba43061cab1 tree f71792b9ac32edd8016900067b55dff8f3941cf3 parent 338fcf9886df9ad2873772197a73a57818973316 author Alexey Dobriyan Mon, 05 Jun 2006 21:06:41 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:39 -0700 [IPV4]: Right prototype of __raw_v4_lookup() All users pass 32-bit values as addresses and internally they're compared with 32-bit entities. So, change "laddr" and "raddr" types to __be32. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 338fcf9886df9ad2873772197a73a57818973316 tree 3d58fed24e4c171110788ad479093a9b4ba27133 parent 70df2311ee3fc607e7511873d7dade5bd17d593d author Alexey Dobriyan Mon, 05 Jun 2006 21:04:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:37 -0700 [IPV4] igmp: Fixup struct ip_mc_list::multiaddr type All users except two expect 32-bit big-endian value. One is of ->multiaddr = ->multiaddr variety. And last one is "%08lX". Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 70df2311ee3fc607e7511873d7dade5bd17d593d tree b47ade0173eef5c30fbe57cc9ceea204783b2def parent 738980ffa658c86bd494ebb242ce8e44aff16a9e author David S. Miller Mon, 05 Jun 2006 17:59:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:35 -0700 [TCP]: Fix compile warning in tcp_probe.c The suseconds_t et al. are not necessarily any particular type on every platform, so cast to unsigned long so that we can use one printf format string and avoid warnings across the board Signed-off-by: David S. Miller commit 738980ffa658c86bd494ebb242ce8e44aff16a9e tree 92076c6d40f3024d760a5439e564473d70511af0 parent a42e9d6ce89cfd19aee9f990b7231ce697f0d00f author Stephen Hemminger Mon, 05 Jun 2006 17:30:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:33 -0700 [TCP]: Limited slow start for Highspeed TCP Implementation of RFC3742 limited slow start. Added as part of the TCP highspeed congestion control module. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a42e9d6ce89cfd19aee9f990b7231ce697f0d00f tree 3afea026bdf3698fd81509925d8cf7d5f1e95fbd parent 72dc5b9225c53310c010b68a70ea97c8c8e24bdf author Stephen Hemminger Mon, 05 Jun 2006 17:30:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:31 -0700 [TCP]: TCP Probe congestion window tracing This adds a new module for tracking TCP state variables non-intrusively using kprobes. It has a simple /proc interface that outputs one line for each packet received. A sample usage is to collect congestion window and ssthresh over time graphs. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 72dc5b9225c53310c010b68a70ea97c8c8e24bdf tree ebd23e7cbe9846414b6fa8f8327f37043447e019 parent a4ed25849532728effaa0665c92e08e029e41407 author Stephen Hemminger Mon, 05 Jun 2006 17:30:08 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:29 -0700 [TCP]: Minimum congestion window consolidation. Many of the TCP congestion methods all just use ssthresh as the minimum congestion window on decrease. Rather than duplicating the code, just have that be the default if that handle in the ops structure is not set. Minor behaviour change to TCP compound. It probably wants to use this (ssthresh) as lower bound, rather than ssthresh/2 because the latter causes undershoot on loss. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a4ed25849532728effaa0665c92e08e029e41407 tree 812c1da0f0052715ae07e3beb088344115c27daf parent f890f921040fef6a35e39d15b729af1fd1a35f29 author Stephen Hemminger Mon, 05 Jun 2006 17:29:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:27 -0700 [TCP]: TCP Compound quad root function The original code did a 64 bit divide directly, which won't work on 32 bit platforms. Rather than doing a 64 bit square root twice, just implement a 4th root function in one pass using Newton's method. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f890f921040fef6a35e39d15b729af1fd1a35f29 tree 130ee6a827a092cc205d6054d2e11f185e60ad1c parent 76f1017757aa0c308a0b83ca611c9a89ee9a79a4 author Angelo P. Castellani Mon, 05 Jun 2006 17:29:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:25 -0700 [TCP]: TCP Compound congestion control TCP Compound is a sender-side only change to TCP that uses a mixed Reno/Vegas approach to calculate the cwnd. For further details look here: ftp://ftp.research.microsoft.com/pub/tr/TR-2005-86.pdf Signed-off-by: Angelo P. Castellani Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 76f1017757aa0c308a0b83ca611c9a89ee9a79a4 tree 2599325e5774525b5ea0088f1c64cbd2e1f40410 parent 7c106d7e782bd4805f39da30e81018f861b4b8c5 author Bin Zhou Mon, 05 Jun 2006 17:28:30 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:23 -0700 [TCP]: TCP Veno congestion control TCP Veno module is a new congestion control module to improve TCP performance over wireless networks. The key innovation in TCP Veno is the enhancement of TCP Reno/Sack congestion control algorithm by using the estimated state of a connection based on TCP Vegas. This scheme significantly reduces "blind" reduction of TCP window regardless of the cause of packet loss. This work is based on the research paper "TCP Veno: TCP Enhancement for Transmission over Wireless Access Networks." C. P. Fu, S. C. Liew, IEEE Journal on Selected Areas in Communication, Feb. 2003. Original paper and many latest research works on veno: http://www.ntu.edu.sg/home/ascpfu/veno/veno.html Signed-off-by: Bin Zhou Cheng Peng Fu Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7c106d7e782bd4805f39da30e81018f861b4b8c5 tree a0bf2f8820c599151ee951a412e86039da3a11ba parent 2f45c340e09242641d4f11498c3be48b35abb926 author Wong Hoi Sing Edison Mon, 05 Jun 2006 17:27:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:21 -0700 [TCP]: TCP Low Priority congestion control TCP Low Priority is a distributed algorithm whose goal is to utilize only the excess network bandwidth as compared to the ``fair share`` of bandwidth as targeted by TCP. Available from: http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf Original Author: Aleksandar Kuzmanovic See http://www-ece.rice.edu/networks/TCP-LP/ for their implementation. As of 2.6.13, Linux supports pluggable congestion control algorithms. Due to the limitation of the API, we take the following changes from the original TCP-LP implementation: o We use newReno in most core CA handling. Only add some checking within cong_avoid. o Error correcting in remote HZ, therefore remote HZ will be keeped on checking and updating. o Handling calculation of One-Way-Delay (OWD) within rtt_sample, sicne OWD have a similar meaning as RTT. Also correct the buggy formular. o Handle reaction for Early Congestion Indication (ECI) within pkts_acked, as mentioned within pseudo code. o OWD is handled in relative format, where local time stamp will in tcp_time_stamp format. Port from 2.4.19 to 2.6.16 as module by: Wong Hoi Sing Edison Hung Hing Lun Signed-off-by: Wong Hoi Sing Edison Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2f45c340e09242641d4f11498c3be48b35abb926 tree 9a14226719f9a1e10d7ef219e24404570be155f2 parent c45fb1089e714146206d7e295ff337893424c874 author Andrew Morton Fri, 02 Jun 2006 16:29:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:19 -0700 [LLC]: Fix double receive of SKB. Oops fix from Stephen: remove duplicate rcv() calls. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c45fb1089e714146206d7e295ff337893424c874 tree 6482dbb72e3670e4ab7ee3b81683383dad4f7c9c parent ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768 author Alexey Dobriyan Mon, 29 May 2006 18:27:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:17 -0700 [NETFILTER]: PPTP helper: fixup gre_keymap_lookup() return type GRE keys are 16-bit wide. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768 tree 54de467b6ee9344a51c8b254be3da933b57cc531 parent e44ab66a75e20c02193440a5e27c16c91630109b author Patrick McHardy Mon, 29 May 2006 18:27:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:15 -0700 [NETFILTER]: Add SIP connection tracking helper Add SIP connection tracking helper. Originally written by Christian Hentschel , some cleanup, minor fixes and bidirectional SIP support added by myself. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e44ab66a75e20c02193440a5e27c16c91630109b tree 13aa30980b223b19720ff5d864d43e3708339fdc parent c0d4cfd96dd0cc0dbf49435898808b5553af4822 author Patrick McHardy Mon, 29 May 2006 18:26:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:13 -0700 [NETFILTER]: H.323 helper: replace internal_net_addr parameter by routing-based heuristic Call Forwarding doesn't need to create an expectation if both peers can reach each other without our help. The internal_net_addr parameter lets the user explicitly specify a single network where this is true, but is not very flexible and even fails in the common case that calls will both be forwarded to outside parties and inside parties. Use an optional heuristic based on routing instead, the assumption is that if bpth the outgoing device and the gateway are equal, both peers can reach each other directly. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c0d4cfd96dd0cc0dbf49435898808b5553af4822 tree aa8fb9afbed9da300bb22adfd3798fe7e196cee0 parent c95261693467f0aeac7fafa69860ddfb02bc12f8 author Jing Min Zhao Mon, 29 May 2006 18:26:27 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:11 -0700 [NETFILTER]: H.323 helper: Add support for Call Forwarding Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c95261693467f0aeac7fafa69860ddfb02bc12f8 tree 07d8686091cfe893d021e6d897983331fc596b3c parent 7d8c50181778b6ba10c2bba9a2f22db9493bb245 author Patrick McHardy Mon, 29 May 2006 18:25:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:09 -0700 [NETFILTER]: amanda helper: convert to textsearch infrastructure When a port number within a packet is replaced by a differently sized number only the packet is resized, but not the copy of the data. Following port numbers are rewritten based on their offsets within the copy, leading to packet corruption. Convert the amanda helper to the textsearch infrastructure to avoid the copy entirely. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7d8c50181778b6ba10c2bba9a2f22db9493bb245 tree b0a87854e0c377eccca3849351951d5456687729 parent 695ecea3299dba2239d1cb4fd4d4e4c95a5b9ce7 author Patrick McHardy Mon, 29 May 2006 18:25:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:07 -0700 [NETFILTER]: FTP helper: search optimization Instead of skipping search entries for the wrong direction simply index them by direction. Based on patch by Pablo Neira Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 695ecea3299dba2239d1cb4fd4d4e4c95a5b9ce7 tree 5262c56a6d34a355ac424a0b63757eb32d94ac08 parent 89f2e21883b59a6ff1e64d0b4924d06b1c6101ba author Patrick McHardy Mon, 29 May 2006 18:25:14 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:05 -0700 [NETFILTER]: SNMP helper: fix debug module param type debug is the debug level, not a bool. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 89f2e21883b59a6ff1e64d0b4924d06b1c6101ba tree 86c26d648afcfa3a37270189a33867cbf0d38f9b parent 3726add76643c715d437aceda320d319153b6113 author Patrick McHardy Mon, 29 May 2006 18:24:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:03 -0700 [NETFILTER]: ctnetlink: change table dumping not to require an unique ID Instead of using the ID to find out where to continue dumping, take a reference to the last entry dumped and try to continue there. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3726add76643c715d437aceda320d319153b6113 tree 70b343ab57ae6575ebc2828cc1e8bab24c4df120 parent 997ae831ade74bdaed4172b1c02060b9efd6e206 author Patrick McHardy Mon, 29 May 2006 18:24:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:01 -0700 [NETFILTER]: ctnetlink: fix NAT configuration The current configuration only allows to configure one manip and overloads conntrack status flags with netlink semantic. Signed-off-by: Patrick Mchardy Signed-off-by: David S. Miller commit 997ae831ade74bdaed4172b1c02060b9efd6e206 tree feca25f5c27c47724ecfbcc66f4f437619fb57ed parent 39a27a35c5c1b5be499a0576a35c45a011788bf8 author Eric Leblond Mon, 29 May 2006 18:24:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:59 -0700 [NETFILTER]: conntrack: add fixed timeout flag in connection tracking Add a flag in a connection status to have a non updated timeout. This permits to have connection that automatically die at a given time. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 39a27a35c5c1b5be499a0576a35c45a011788bf8 tree ec5383eec578c455ca5a14184dc9398bbc5f9afb parent 6442f1cf897643d4ca597f2f7d3464b765bae960 author Patrick McHardy Mon, 29 May 2006 18:23:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:57 -0700 [NETFILTER]: conntrack: add sysctl to disable checksumming Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6442f1cf897643d4ca597f2f7d3464b765bae960 tree 0708a7d312c1db1f78c20df9cbdfc9f5e6218523 parent 404bdbfd242cb99ca0e9d3eb5fbb5bcd54123081 author Patrick McHardy Mon, 29 May 2006 18:21:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:55 -0700 [NETFILTER]: conntrack: don't call helpers for related ICMP messages None of the existing helpers expects to get called for related ICMP packets and some even drop them if they can't parse them. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 404bdbfd242cb99ca0e9d3eb5fbb5bcd54123081 tree a6a0ad112275016d3e622d4ab53cac6f2e0dcd3d parent f3389805e53a13bd969ee1c8fc5a4137b7c6c167 author Patrick McHardy Mon, 29 May 2006 18:21:34 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:53 -0700 [NETFILTER]: recent match: replace by rewritten version Replace the unmaintainable ipt_recent match by a rewritten version that should be fully compatible. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f3389805e53a13bd969ee1c8fc5a4137b7c6c167 tree f73b639579da1f201c1886027d59960380c2296a parent 62b7743483b402f8fb73545d5d487ca714e82766 author Patrick McHardy Mon, 29 May 2006 18:21:00 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:51 -0700 [NETFILTER]: x_tables: add statistic match Add statistic match which is a combination of the nth and random matches. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 62b7743483b402f8fb73545d5d487ca714e82766 tree f90e434e85c1f4391ad46310ee128ce25c1dca57 parent 957dc80ac30f3c4d53259fa936df807663ba54fa author Patrick McHardy Mon, 29 May 2006 18:20:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:49 -0700 [NETFILTER]: x_tables: add quota match Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 957dc80ac30f3c4d53259fa936df807663ba54fa tree 4815a3d43700d79868f50c83b4850502a12a7dd4 parent 3e72b2fe5b31791f976350b023b7a37ef59c02c1 author Patrick McHardy Mon, 29 May 2006 18:19:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:47 -0700 [NETFILTER]: x_tables: add SCTP/DCCP support where missing Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3e72b2fe5b31791f976350b023b7a37ef59c02c1 tree 94c34d9264d68141c11530cb94f58ed4d03a1dbd parent 73654d61e556483ad324b90989eae26b22df6ef6 author Patrick McHardy Mon, 29 May 2006 18:19:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:45 -0700 [NETFILTER]: x_tables: remove some unnecessary casts Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 73654d61e556483ad324b90989eae26b22df6ef6 tree f3aee3be0e35bb6012917b71ed77301de6b39ad4 parent 31a4ab93025719e62e7cf7ce899f71c34ecde5a0 author Herbert Xu Sat, 27 May 2006 23:06:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:43 -0700 [IPSEC] xfrm: Use IPPROTO_MAX instead of 256 The size of the type_map array (256) comes from the number of IP protocols, i.e., IPPROTO_MAX. This patch is based on a suggestion from Ingo Oeser. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 31a4ab93025719e62e7cf7ce899f71c34ecde5a0 tree 60404c5fd1124882753b38e334656a15f8de0804 parent b59f45d0b2878ab76f8053b0973654e6621828ee author Herbert Xu Sat, 27 May 2006 23:06:13 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:41 -0700 [IPSEC] proto: Move transport mode input path into xfrm_mode_transport Now that we have xfrm_mode objects we can move the transport mode specific input decapsulation code into xfrm_mode_transport. This removes duplicate code as well as unnecessary header movement in case of tunnel mode SAs since we will discard the original IP header immediately. This also fixes a minor bug for transport-mode ESP where the IP payload length is set to the correct value minus the header length (with extension headers for IPv6). Of course the other neat thing is that we no longer have to allocate temporary buffers to hold the IP headers for ESP and IPComp. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b59f45d0b2878ab76f8053b0973654e6621828ee tree 40dc5e2ede2620f7935fb3dae0d0eb199851f611 parent 546be2405be119ef55467aace45f337a16e5d424 author Herbert Xu Sat, 27 May 2006 23:05:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:39 -0700 [IPSEC] xfrm: Abstract out encapsulation modes This patch adds the structure xfrm_mode. It is meant to represent the operations carried out by transport/tunnel modes. By doing this we allow additional encapsulation modes to be added without clogging up the xfrm_input/xfrm_output paths. Candidate modes include 4-to-6 tunnel mode, 6-to-4 tunnel mode, and BEET modes. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 546be2405be119ef55467aace45f337a16e5d424 tree 9b09f0041f9f82a20ab25ace3c7360e4a4b7989f parent 9cb3528cdbffc513eb9fb8faa45d41e397355830 author Herbert Xu Sat, 27 May 2006 23:03:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:37 -0700 [IPSEC] xfrm: Undo afinfo lock proliferation The number of locks used to manage afinfo structures can easily be reduced down to one each for policy and state respectively. This is based on the observation that the write locks are only held by module insertion/removal which are very rare events so there is no need to further differentiate between the insertion of modules like ipv6 versus esp6. The removal of the read locks in xfrm4_policy.c/xfrm6_policy.c might look suspicious at first. However, after you realise that nobody ever takes the corresponding write lock you'll feel better :) As far as I can gather it's an attempt to guard against the removal of the corresponding modules. Since neither module can be unloaded at all we can leave it to whoever fixes up IPv6 unloading :) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9cb3528cdbffc513eb9fb8faa45d41e397355830 tree 468eaacb1e62026f737c621f9c3e00806be71fd1 parent df3e6548186f0baa727cd6d3a492891854bd31f2 author Michael Chan Sat, 17 Jun 2006 21:28:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:28 -0700 [TG3]: update version and reldate Update version to 3.60. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit df3e6548186f0baa727cd6d3a492891854bd31f2 tree 525617b51451b730b0723d57258c6a8bf7f53d09 parent 30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a author Michael Chan Fri, 26 May 2006 17:48:07 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:26 -0700 [TG3]: Add recovery logic when MMIOs are re-ordered Add recovery logic when we suspect that the system is re-ordering MMIOs. Re-ordered MMIOs to the send mailbox can cause bogus tx completions and hit BUG_ON() in the tx completion path. tg3 already has logic to handle re-ordered MMIOs by flushing the MMIOs that must be strictly ordered (such as the send mailbox). Determining when to enable the flush is currently a manual process of adding known chipsets to a list. The new code replaces the BUG_ON() in the tx completion path with the call to tg3_tx_recover(). It will set the TG3_FLAG_MBOX_WRITE_REORDER flag and reset the chip later in the workqueue to recover and start flushing MMIOs to the mailbox. A message to report the problem will be printed. We will then decide whether or not to add the host bridge to the list of chipsets that do re-ordering. We may add some additional code later to print the host bridge's ID so that the user can report it more easily. The assumption that re-ordering can only happen on x86 systems is also removed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a tree eb7d8cf4f45b1030aaa17cb816fe1bbdbd35abd8 parent 898b1d16f8230fb912a0c2248df685735c6ceda3 author Michael Chan Fri, 26 May 2006 17:44:45 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:24 -0700 [TG3]: Add 5786 PCI ID Add PCI ID for BCM5786 which is a variant of 5787. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 898b1d16f8230fb912a0c2248df685735c6ceda3 tree e5e78b80373b4e2c74d9870d70f9deee0b3f7677 parent bc1d6937e6cf4e81a5afeae2c9cf35ffb0905ba5 author Samuel Ortiz Thu, 25 May 2006 16:21:10 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:22 -0700 [IRDA]: ali-ircc: using device model power management This patch gets rid of the old power management code and now uses the device model for the ali-ircc driver. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit bc1d6937e6cf4e81a5afeae2c9cf35ffb0905ba5 tree b8cbfa60a9f296d24c0ca558906cd7457062bf97 parent c6ae522e3a50fc1ec483d7f03ece9c7a25e6de95 author Christoph Hellwig Thu, 25 May 2006 16:20:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:20 -0700 [IRDA]: stir4200, switching to the kthread API stir4200 uses a kernel thread for its TX/RX operations, and it is now converted to the kernel kthread API. Tested on an STIR4200 based dongle. Signed-off-by: Christoph Hellwig Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit c6ae522e3a50fc1ec483d7f03ece9c7a25e6de95 tree 98a67649b473bfc64751458283aeb3bb47e76703 parent 15986e1aadbbf40a331cddd0470bb434d156431d author Samuel Ortiz Thu, 25 May 2006 16:19:22 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:18 -0700 [IRDA]: Initial support for MCS7780 based dongles The MosChip MCS7780 chipset is an IrDA USB bridge that doesn't conform with the IrDA-USB standard and thus needs its separate driver. Tested on an actual MCS7780 based dongle. Original implementation by Brian Pugh Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 15986e1aadbbf40a331cddd0470bb434d156431d tree bcfa9d6d58fbf89184a951c4738d9d3ec8cae0d5 parent 11dc1f36a6701b502ecb695f308aae46ede8bac6 author David S. Miller Thu, 25 May 2006 16:11:14 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:16 -0700 [TCP]: tcp_rcv_rtt_measure_ts() call in pure-ACK path is superfluous We only want to take receive RTT mesaurements for data bearing frames, here in the header prediction fast path for a pure-sender, we know that we have a pure-ACK and thus the checks in tcp_rcv_rtt_mesaure_ts() will not pass. Signed-off-by: David S. Miller commit 11dc1f36a6701b502ecb695f308aae46ede8bac6 tree e510f5514b3885489c8fe9a1661a7fa7b9e88f8d parent c090971326db094ed702c1f8f2dbe04b7e3b8f27 author Stephen Hemminger Thu, 25 May 2006 16:00:12 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:14 -0700 [BRIDGE]: netlink interface for link management Add basic netlink support to the Ethernet bridge. Including: * dump interfaces in bridges * monitor link status changes * change state of bridge port For some demo programs see: http://developer.osdl.org/shemminger/prototypes/brnl.tar.gz These are to allow building a daemon that does alternative implementations of Spanning Tree Protocol. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c090971326db094ed702c1f8f2dbe04b7e3b8f27 tree 9c964fc79298455eb4b45981a34a6117175ff846 parent 9ef513bed68534110727381ab652f06756803f5a author Stephen Hemminger Thu, 25 May 2006 15:59:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:12 -0700 [BRIDGE]: fix module startup error handling Return address in use, if some other kernel code has the SAP. Propogate out error codes from netfilter registration and unwind. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9ef513bed68534110727381ab652f06756803f5a tree d4981dbce1d613c68d022ed3509eb3bf41c7c4fb parent bc0e646796928918e45b6465e02616f2fe65c3c1 author Stephen Hemminger Thu, 25 May 2006 15:58:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:10 -0700 [BRIDGE]: optimize conditional in forward path Small optimizations of bridge forwarding path. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bc0e646796928918e45b6465e02616f2fe65c3c1 tree 8c7a52563188e7e4168cd98b58b980c8096c02ce parent 8f182b494f87799d6ae20a1401825c516da46081 author Stephen Hemminger Thu, 25 May 2006 15:10:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:08 -0700 [LLC]: add multicast support for datagrams Allow mulitcast reception of datagrams (similar to UDP). All sockets bound to the same SAP receive a clone. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8f182b494f87799d6ae20a1401825c516da46081 tree 509fc735e59cb1094cd68029a9e0a4b9a9a01e86 parent 23dbe7912dad6be71bb9e69cb819d05e2442d362 author Stephen Hemminger Thu, 25 May 2006 15:10:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:06 -0700 [LLC]: allow applications to get copy of kernel datagrams It is legal for an application to bind to a SAP that is also being used by the kernel. This happens if the bridge module binds to the STP SAP, and the user wants to have a daemon for STP as well. It is possible to have kernel doing STP on one bridge, but let application do RSTP on another bridge. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 23dbe7912dad6be71bb9e69cb819d05e2442d362 tree 89fedd1d2c2c1ab710cfd90e8a8bb1f513935797 parent 29efcd2666b3a465b40aa07ef1f4d79847303e2f author Stephen Hemminger Thu, 25 May 2006 15:09:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:04 -0700 [LLC]: use rcu_dereference on receive handler The receive hander pointer might be modified during network changes of protocol. So use rcu_dereference (only matters on alpha). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 29efcd2666b3a465b40aa07ef1f4d79847303e2f tree 6d1b3bb6543a24a6aa1a319adea20fbcea7b930a parent aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 author Stephen Hemminger Thu, 25 May 2006 15:08:59 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:02 -0700 [LLC]: allow datagram recvmsg LLC receive is broken for SOCK_DGRAM. If an application does recv() on a datagram socket and there is no data present, don't return "not connected". Instead, just do normal datagram semantics. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 tree 4e5a1e9e2625287acfcb27e693c634700bf57611 parent 17f3ae08b6e7fd778371f2cafbd1c988a67ee343 author Stephen Hemminger Thu, 25 May 2006 15:08:30 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:00 -0700 [LLC]: use more efficient ether address routines Use more cache efficient Ethernet address manipulation functions in etherdevice.h. Signed-off-by: Stephen Hemminger commit 17f3ae08b6e7fd778371f2cafbd1c988a67ee343 tree 9e33f603469628d9bbe679bede945d61e7417dbf parent 1a2449a87bb7606113b1aa1a9d3c3e78ef189a1c author Andrew Morton Thu, 25 May 2006 13:26:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:58 -0700 [I/OAT]: Do not use for_each_cpu(). for_each_cpu() is going away (and is gone in -mm). Signed-off-by: Andrew Morton Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 1a2449a87bb7606113b1aa1a9d3c3e78ef189a1c tree 86e833a8694f201de138697646e7e8469e9c8ef6 parent 9593782585e0cf70babe787a8463d492a68b1744 author Chris Leech Tue, 23 May 2006 18:05:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:56 -0700 [I/OAT]: TCP recv offload to I/OAT Locks down user pages and sets up for DMA in tcp_recvmsg, then calls dma_async_try_early_copy in tcp_v4_do_rcv Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 9593782585e0cf70babe787a8463d492a68b1744 tree 149401a3973036452a07bed899e70d3b92abe1bf parent 624d1164730d58a494cc5aa4afa37d02c41e83a7 author Chris Leech Tue, 23 May 2006 18:02:55 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:54 -0700 [I/OAT]: Add a sysctl for tuning the I/OAT offloaded I/O threshold Any socket recv of less than this ammount will not be offloaded Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 624d1164730d58a494cc5aa4afa37d02c41e83a7 tree b6cc0776a826f8f2611eff41149410c7f4ccb355 parent 0e4b4992b8007c6b62ec143cbbb292f98813ca11 author Chris Leech Tue, 23 May 2006 18:01:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:52 -0700 [I/OAT]: Make sk_eat_skb I/OAT aware. Add an extra argument to sk_eat_skb, and make it move early copied packets to the async_wait_queue instead of freeing them. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 0e4b4992b8007c6b62ec143cbbb292f98813ca11 tree fccdef8ec226d1febc5f7c22a793b10337026187 parent 97fc2f0848c928c63c2ae619deee61a0b1107b69 author Chris Leech Tue, 23 May 2006 18:00:16 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:50 -0700 [I/OAT]: Rename cleanup_rbuf to tcp_cleanup_rbuf and make non-static Needed to be able to call tcp_cleanup_rbuf in tcp_input.c for I/OAT Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 97fc2f0848c928c63c2ae619deee61a0b1107b69 tree 651f5ec78128605736d6c777a13697d5e58a1b62 parent de5506e155276d385712c2aa1c2d9a27cd4ed947 author Chris Leech Tue, 23 May 2006 17:55:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:48 -0700 [I/OAT]: Structure changes for TCP recv offload to I/OAT Adds an async_wait_queue and some additional fields to tcp_sock, and a dma_cookie_t to sk_buff. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit de5506e155276d385712c2aa1c2d9a27cd4ed947 tree 219c30dab27b9aef2597d8735dfc19db8454849e parent db21733488f84a596faaad0d05430b3f51804692 author Chris Leech Tue, 23 May 2006 17:50:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:46 -0700 [I/OAT]: Utility functions for offloading sk_buff to iovec copies Provides for pinning user space pages in memory, copying to iovecs, and copying from sk_buffs including fragmented and chained sk_buffs. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit db21733488f84a596faaad0d05430b3f51804692 tree a2c1f6d39ce27d2e86b395f2bf536c1ab7396411 parent 57c651f74cd8383df10a648e677902849de1bc0b author Chris Leech Sat, 17 Jun 2006 21:24:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:24:58 -0700 [I/OAT]: Setup the networking subsystem as a DMA client Attempts to allocate per-CPU DMA channels Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 57c651f74cd8383df10a648e677902849de1bc0b tree caf432ce2828b25e17cea3cff523e481c740c65e parent 6b00c92c4b26428cd80e966380c07103556f7b14 author David S. Miller Tue, 23 May 2006 17:39:49 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:50 -0700 [I/OAT]: Move PCI_DEVICE_ID_INTEL_IOAT to linux/pci_ids.h Signed-off-by: David S. Miller commit 6b00c92c4b26428cd80e966380c07103556f7b14 tree ffaa433a8a0f64285e2365084cf83b329f2070cb parent 0bbd5f4e97ff9c057b385a1886b4aed1fb0300f1 author David S. Miller Tue, 23 May 2006 17:37:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:48 -0700 [I/OAT]: ioatdma.c needs linux/dma-mapping.h For DMA_*_MASK defines. Signed-off-by: David S. Miller commit 0bbd5f4e97ff9c057b385a1886b4aed1fb0300f1 tree 0c3d8528c31e8291fb78c2e7a287910987ed2888 parent c13c8260da3155f2cefb63b0d1b7dcdcb405c644 author Chris Leech Tue, 23 May 2006 17:35:34 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:46 -0700 [I/OAT]: Driver for the Intel(R) I/OAT DMA engine Adds a new ioatdma driver Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit c13c8260da3155f2cefb63b0d1b7dcdcb405c644 tree ecfe02fa44a423a948f5fb5ad76497da2bb7a402 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Chris Leech Tue, 23 May 2006 17:18:44 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:43 -0700 [I/OAT]: DMA memcpy subsystem Provides an API for offloading memory copies to DMA devices Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 9ead190bfde2a434c74ea604382d08acb2eceef5 tree 937f1bb8dedea56efc46aed12370bb3865898763 parent c93b6fbaa99bb3a1552e14317296be14dde51dfb author Roland Dreier Sat, 17 Jun 2006 20:44:49 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:44:49 -0700 IB/uverbs: Don't serialize with ib_uverbs_idr_mutex Currently, all userspace verbs operations that call into the kernel are serialized by ib_uverbs_idr_mutex. This can be a scalability issue for some workloads, especially for devices driven by the ipath driver, which needs to call into the kernel even for datapath operations. Fix this by adding reference counts to the userspace objects, and then converting ib_uverbs_idr_mutex into a spinlock that only protects the idrs long enough to take a reference on the object being looked up. Because remove operations may fail, we have to do a slightly funky two-step deletion, which is described in the comments at the top of uverbs_cmd.c. This also still leaves ib_uverbs_idr_lock as a single lock that is possibly subject to contention. However, the lock hold time will only be a single idr operation, so multiple threads should still be able to make progress, even if ib_uverbs_idr_lock is being ping-ponged. Surprisingly, these changes even shrink the object code: add/remove: 23/5 grow/shrink: 4/21 up/down: 633/-693 (-60) Signed-off-by: Roland Dreier commit c93b6fbaa99bb3a1552e14317296be14dde51dfb tree bad61dc728f0eb28fcfdf01953cd0ae43a4b2350 parent c9c5d9feef86debee4d8e77a738ad86877cf371a author Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 IB/mthca: Make all device methods truly reentrant Documentation/infiniband/core_locking.txt says: All of the methods in struct ib_device exported by a low-level driver must be fully reentrant. The low-level driver is required to perform all synchronization necessary to maintain consistency, even if multiple function calls using the same object are run simultaneously. However, mthca's modify_qp, modify_srq and resize_cq methods are currently not reentrant. Add a mutex to the QP, SRQ and CQ structures so that these calls can be properly serialized. Signed-off-by: Roland Dreier commit c9c5d9feef86debee4d8e77a738ad86877cf371a tree 692adc21d8337a063be7e159860ded87b6e6829a parent 3463175d6ee55fdbd5cda2a03415e2068599b2b7 author Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 IB/mthca: Fix memory leak on modify_qp error paths Some error paths after the mthca_alloc_mailbox() call in mthca_modify_qp() just do a "return -EINVAL" without freeing the mailbox. Convert these returns to "goto out" to avoid leaking the mailbox storage. Signed-off-by: Roland Dreier commit 3463175d6ee55fdbd5cda2a03415e2068599b2b7 tree f629b7c65894d591d861bb121a71f67d0b960f36 parent 92b1582268e269b3a9e54e186e740396f0f2012b author Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Factor out common idr code Factor out common code for adding a userspace object to an idr into a function idr_add_uobj(). This shrinks both the source and object code: add/remove: 1/0 grow/shrink: 0/6 up/down: 57/-220 (-163) function old new delta idr_add_uobj - 57 +57 ib_uverbs_create_ah 543 512 -31 ib_uverbs_create_srq 662 630 -32 ib_uverbs_reg_mr 737 699 -38 ib_uverbs_create_cq 639 600 -39 ib_uverbs_alloc_pd 485 446 -39 ib_uverbs_create_qp 1020 979 -41 Signed-off-by: Roland Dreier commit 92b1582268e269b3a9e54e186e740396f0f2012b tree 6dee998bb8c363ccecdf1f36f155875aea80cdc1 parent 77f76013e3ffda605b20184db5862ce1efcb6f5a author Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Don't decrement usecnt on error paths In error paths when destroying an object, uverbs should not decrement associated objects' usecnt, since ib_dereg_mr(), ib_destroy_qp(), etc. already do that. Signed-off-by: Roland Dreier commit 77f76013e3ffda605b20184db5862ce1efcb6f5a tree ce0c5fb39d891027e2609f74a160eb54b15dce37 parent ca222c6b2c48e1e0be330a55611ba394251330cb author Ganapathi CH Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Release lock on error path If ibdev->alloc_ucontext() fails then ib_uverbs_get_context() does not unlock file->mutex before returning error. Signed-off by: Ganapathi CH Signed-off-by: Roland Dreier commit ca222c6b2c48e1e0be330a55611ba394251330cb tree 80491af9034f3cadad8b68fdb140bb6909f4e48e parent 6d969a471ba107d94cf03dab3c69f45b9733f500 author Sean Hefty Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/cm: Use address handle helpers Use new ib_init_ah_from_wc() and ib_init_ah_from_path() helper functions to clean up the IB CM. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6d969a471ba107d94cf03dab3c69f45b9733f500 tree 7a9fea5c2a321434e5c4c3bc590393728b85b4dd parent 4e00d69454a8747798de11dc4eeef1edeee5ce98 author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB/sa: Add ib_init_ah_from_path() Add a call to initialize address handle attributes given a path record. This is used by the CM, and would be useful for users of UD QPs. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e00d69454a8747798de11dc4eeef1edeee5ce98 tree e09582595f80e1e7479c4f8b5a559be0db9ac251 parent 75af9088514432ef0c1052ba3767ceb0beb6f101 author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB: Add ib_init_ah_from_wc() Add a function to initialize address handle attributes from a work completion. This functionality is duplicated by both verbs and the CM. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 75af9088514432ef0c1052ba3767ceb0beb6f101 tree 92f312a058889beef2c85a18b9b7f231947c7590 parent 526b4caa0a48382115fa9d8f7d8caf68dbcaa2bf author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB/ucm: Get rid of duplicate P_Key parameter The P_Key is provided into a SIDR REQ in two places, once as a parameter, and again in the path record. Remove the P_Key as a parameter and always use the one given in the path record. This change has no practical effect on ABI functionality. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 526b4caa0a48382115fa9d8f7d8caf68dbcaa2bf tree 82383da15f298a7d42f161e12bea175f55b78dea parent 0c0450db31481aa01a04e7faecc93ee6841972d6 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 IB/srp: Factor out common request reset code Misc cleanups in ib_srp: 1) I think that it is more efficient to move the req entries from req_list to free_list in srp_reconnect_target (rather than rebuild the free_list). (In any case this code is shorter). 2) This allows us to reuse code in srp_reset_device and srp_reconnect_target and call a new function srp_reset_req. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 0c0450db31481aa01a04e7faecc93ee6841972d6 tree c7a1ed2896345d022011831f8a9aaa21e8d8ff00 parent 73c0996b1ca60338fa50e42acfcebd32b7636a8b author Ramachandra K Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 IB/srp: Support SRP rev. 10 targets There has been a change in the format of port identifiers between revision 10 of the SRP specification and the current revision 16A. Revision 10 specifies port identifier format as lower 8 bytes : GUID upper 8 bytes : Extension Whereas revision 16A specifies it as lower 8 bytes : Extension upper 8 bytes : GUID There are older targets (e.g. SilverStorm Virtual Fibre Channel Bridge) which conform to revision 10 of the SRP specification. The I/O class of revision 10 is 0xFF00 and the I/O class of revision 16A is 0x0100. For supporting older targets, this patch: 1) Adds a new optional target creation parameter "io_class". Default value of io_class is 0x0100 (i.e. revision 16A) 2) Uses the correct port identifier format for targets with IO class of 0xFF00 (i.e. conforming to revision 10) Signed-off-by: Ramachandra K Signed-off-by: Roland Dreier commit 73c0996b1ca60338fa50e42acfcebd32b7636a8b tree d4c0378fbac112b25e3a1adf66b06a8d0a32087d parent 6c8c1aa25d213a288df381f431ce5b6a155146ec author Ramachandra K Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 [SCSI] srp.h: Add I/O Class values Add enum values for I/O Class values from rev. 10 and rev. 16a SRP drafts. The values are used to detect targets that implement obsolete revisions of SRP, so that the initiator can use the old format for port identifier when connecting to them. Signed-off-by: Ramachandra K Signed-off-by: Roland Dreier commit 6c8c1aa25d213a288df381f431ce5b6a155146ec tree 379670131076d3ca0af68f9e91f6f038e86e0e96 parent d4cb0784fd1ea99ef3d20526811bd5608146fe60 author Or Gerlitz Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool. When creating a FMR pool, query the IB device and use the returned max_map_map_per_fmr attribute as for the max number of FMR remaps. If the device does not suport querying this attribute, use the original IB_FMR_MAX_REMAPS (32) default. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit d4cb0784fd1ea99ef3d20526811bd5608146fe60 tree 214f2e6923c9a04c27b09d790968736cc90c0cdd parent 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 author Or Gerlitz Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/mthca: Fill in max_map_per_fmr device attribute Report the true max_map_per_fmr value from mthca_query_device(), taking into account the change in FMR remapping introduced by the Sinai performance optimization. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 tree 8f12b13a64030e422b7c7d753009dab3dce3aa6b parent 12bbb2b7be7f5564952ebe0196623e97464b8ac5 author Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/ipath: Add client reregister event generation Generate a client reregister event instead of a LID change event when client reregister bit is set. Signed-off-by: Roland Dreier commit 12bbb2b7be7f5564952ebe0196623e97464b8ac5 tree 2c2aed2ffd043a145ba0369a799d9e8a1bd29ede parent da2ab62ab5e430e6ffafc2d0e6046dcd2780f570 author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IB/mthca: Add client reregister event generation Change the mthca snoop of MADs that set PortInfo to check if the SM has set the client reregister bit, and if it has, generate a client reregister event. If the bit is not set, just generate a LID change event as usual. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit da2ab62ab5e430e6ffafc2d0e6046dcd2780f570 tree 8628b70e91c193cd2ed90dca062974dc90fe16d7 parent 508e434123b136c96d1bf989e8d4ab0c8d7498b1 author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IB: Move struct port_info from ipath to Move ipath's struct port_info into , so that it can be used by mthca to implement client reregister support. Remove the __attribute__((packed)) because all the members of the struct are naturally aligned anyway. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 508e434123b136c96d1bf989e8d4ab0c8d7498b1 tree 1085714b3d50f6a8706e6ab5fb5ba721cac38209 parent 63942c9a981ecfa2aabfb27ff1a87b88f2ee9f5b author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IPoIB: Handle client reregister events Handle client reregister events by treating them just like LID or SM changes -- flush all cached paths and rejoin multicast groups. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 63942c9a981ecfa2aabfb27ff1a87b88f2ee9f5b tree 40ddf2d6a967564c979fb198b5a78a4e888fea84 parent 37c22a77212c13201497378cc8becc5c95d0f3f5 author Leonid Arsh Sat, 17 Jun 2006 20:37:35 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:35 -0700 IB: Add client reregister event type Add IB_EVENT_CLIENT_REREGISTER to enum so low-level drivers can generate "client reregister" events. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 37c22a77212c13201497378cc8becc5c95d0f3f5 tree 5a38388266a09c9892e5d8e336d7287ae763e7c0 parent 31c02e215700c2b704d9441f629ae87bb9aeb561 author Jack Morgenstein Mon, 29 May 2006 19:14:05 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:35 -0700 IPoIB: Fix kernel unaligned access on ia64 Fix misaligned access faults on ia64: never cast a misaligned neighbour->ha + 4 pointer to union ib_gid type; pass a void * pointer instead. The memcpy was being optimized to use full word accesses because the compiler thought that union ib_gid is always aligned. The cast in IPOIB_GID_ARG is safe, since it is fixed to access each byte separately. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 31c02e215700c2b704d9441f629ae87bb9aeb561 tree 057b5e1de62cbecbbe6a0a4532e7eab0fd0313e4 parent 9874e746550fbd366484621b8838b98589bb2a15 author Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IPoIB: Avoid using stale last_send counter when reaping AHs The comparisons of priv->tx_tail to ah->last_send in ipoib_free_ah() and ipoib_post_receive() are slightly unsafe, because priv->tx_lock is not held and hence a stale value of ah->last_send might be used, which would lead to freeing an AH before the driver was really done with it. The simple way to fix this is to the optimization of early free from ipoib_free_ah() and unconditionally queue AHs for reaping, and then take priv->tx_lock in __ipoib_reap_ah(). Signed-off-by: Roland Dreier commit 9874e746550fbd366484621b8838b98589bb2a15 tree 8927d1f6a2c082591a539e42202c3b266a684ae0 parent 6fb9cdbf2cdb2ea187e57ec2e16cc59df2adf86a author Jack Morgenstein Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IB/mad: Check GID/LID when matching requests Check GID/LID for requester side when searching for request which matches received response. This is in order to guarantee uniqueness if the same TID is used when requesting via multiple source LIDs (when LMC is not zero). Use ports' cached LMC to perform the check. Further, do not perform LID check for direct-routed packets, since the permissive LID makes a proper check impossible. Signed-off-by: Jack Morgenstein Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6fb9cdbf2cdb2ea187e57ec2e16cc59df2adf86a tree 329eb272835bd3105696ddbc60cdaea971aa2a6e parent 856c256f883f027a14b546164294b4a86fea81a4 author Jack Morgenstein Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IB: Add caching of ports' LMC Add an LMC cache to struct ib_device, and add a function ib_get_cached_lmc() to query the cache. Signed-off-by: Jack Morgenstein Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 856c256f883f027a14b546164294b4a86fea81a4 tree c505262354179db879aed2c8a48806f98ba6c614 parent 4be10c1e6dcafec993ac4f9abfa5fdcd83728302 author Michael S. Tsirkin Thu, 25 May 2006 14:51:33 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/cm: remove unneeded flush_workqueue destroy_workqueue() already does flush_workqueue(). Signed-off-by: Michael S. Tsirkin Signed-off-by: Sean Hefty commit 4be10c1e6dcafec993ac4f9abfa5fdcd83728302 tree c7f804d21f0fb39cf3a7b7e85266eeb020957af2 parent 6bfa24fa3e189269e113197a80e12862c211b3d3 author Sean Hefty Thu, 25 May 2006 10:03:23 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/ucm: convert semaphore to mutex Convert semaphore in ib_ucm_file to a real mutex. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6bfa24fa3e189269e113197a80e12862c211b3d3 tree cdd5adcb58ce726708a48636d3b657155000e8cf parent b7ac4ab497e44cba75fb0e9e5afca06776518934 author Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/srp: Get rid of "Target has req_lim 0" messages It's perfectly valid for a connection to an SRP target to have a request limit of 0, so get rid of the message about it, which can spam kernel logs even with printk_ratelimit(). Keep a count of such events in a "zero_req_lim" SCSI host attribute instead, so someone who cares can look at the statistics. Signed-off-by: Roland Dreier commit b7ac4ab497e44cba75fb0e9e5afca06776518934 tree d0d513d83ef71ea7530a3e57ccac41c3684a4fcb parent ac83cbaa9a41344c3adf329ede607e58d887f354 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IB/srp: Handle DREQ events from CM Handle IB_CM_DREQ_ERROR and IB_CM_DREQ_RECEIVED events from the CM, instead of just printing "Unhandled CM event". In the case of DREQ_ERROR, just ignore the event -- a TIMEWAIT_EXIT will be generated also. For DREQ_RECEIVED, send a DREP in response to shut the connection down cleanly. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit ac83cbaa9a41344c3adf329ede607e58d887f354 tree 5523955d6c776951827f36024e9dc93a3bbdcbab parent 74b0a15b5e18e44206c98419745a472c3d28e561 author Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IPoIB: Mention RFC numbers in documentation Now that the IETF has released RFCs covering IPoIB, give the numbers in the documentation for IPoIB. Signed-off-by: Roland Dreier commit 74b0a15b5e18e44206c98419745a472c3d28e561 tree 9aa9846193df826cc81d2072a0ca56a569ea9668 parent 52fb2b50c4baa1430064c1e6c1c7df473d469df1 author Vu Pham Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IB/srp: Allow sg_tablesize to be adjusted Make the sg_tablesize used by SRP adjustable at module load time via a module parameter. Calculate the corresponding IU length required to support this. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 52fb2b50c4baa1430064c1e6c1c7df473d469df1 tree 7d538c270d6b9064b5674a8fd6f7cf81d8b8580f parent 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c author Vu Pham Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB/srp: Allow cmd_per_lun to be set per target port Allow userspace to throttle traffic on a given connection to a target port by adding "max_cmd_per_lun=xyz" to lower the cmd_per_lun value set for that scsi_host. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c tree 92262c3a2480603bee7e8b8b405a3a4060433315 parent 403a496fd4af3036c12e1f9c90a89cf846fadd35 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB/srp: Clean up loop in srp_remove_one() Interrupts will always be enabled in srp_remove_one(), so spin_lock_irq() can be used instead of spin_lock_irqsave(). Also, the loop takes target->scsi_host->host_lock, so target->state can just be set to SRP_TARGET_REMOVED witout testing the old value. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 403a496fd4af3036c12e1f9c90a89cf846fadd35 tree a2aaa788cb21341f9245db9c7f5c2dfb459d206b parent b3589fd49067bab9fe0c60430860e6befbd5ba37 author Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB: Make needlessly global ib_mad_cache static Signed-off-by: Roland Dreier commit b3589fd49067bab9fe0c60430860e6befbd5ba37 tree be054dba4fd5d39e4af03d18e1d57d3b88033ca7 parent 549c5fc2c8149498118f2494a1b6a4938ca05985 author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Change target_mutex to a spinlock The SRP driver never sleeps while holding target_mutex, and it's just used to protect some simple list operations, so hold times will be short. So just convert it to a spinlock, which is smaller and faster. Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit 549c5fc2c8149498118f2494a1b6a4938ca05985 tree 409aff9ba655db4a58d475a7f74f7917d8eca31e parent 1962a4a1e4b3716aa836ebeb5b80c804a7f7c5ba author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Get rid of unneeded use of list_for_each_entry_safe() list_for_each_entry_safe() is used in one place where the list isn't modified. So just change it to list_for_each_entry(). Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit 1962a4a1e4b3716aa836ebeb5b80c804a7f7c5ba tree f88f56331bdae7d46a16261c1c31ab8731b1ac91 parent e9cd59418f049966a690372c4919e98c88bb119b author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Use SCAN_WILD_CARD from SCSI headers SCAN_WILD_CARD is indeed available from , which is already included. So get rid of private hack. Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit e9cd59418f049966a690372c4919e98c88bb119b tree 7624e7d85f4f927692771483a763dafa9f8bb8d5 parent f5358a172f79e3f995919224401b25637f4324f6 author Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/mthca: Convert FW commands to use wait_for_completion_timeout() The kernel has had wait_for_completion_timeout() for a long time now. mthca should use it to handle FW commands timing out, instead of implementing the same thing in a much more complicated way by using wait_for_completion() along with a timer that does complete(). Signed-off-by: Roland Dreier commit f5358a172f79e3f995919224401b25637f4324f6 tree 52980f6f7707af3fca77958d04e88b9cee3c1a2a parent a26026c1221c3e78e6e9f156994c41fb74e99022 author Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB/srp: Use FMRs to map gather/scatter lists Create an SRP FMR pool on HCAs that support FMRs, and use FMRs to map gather/scatter lists that have more than one entry into a single memory region that appears virtually contiguous to the SRP target (which is the RDMA initiator). This patch bails out on FMR mapping for SCSI commands where the gather/scatter list cannot be mapped into a single FMR because there are sub-page-sized entries in middle of the list. An unaligned start or end of the list is OK. Based on a patch by Vu Pham . Signed-off-by: Roland Dreier commit a26026c1221c3e78e6e9f156994c41fb74e99022 tree 3c5cf6f6e43ffc8d078d096809490a29df7c23e4 parent e51060f08a61965c4dd91516d82fe90617152590 author Michael S. Tsirkin Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB/mthca: Remove dead code Kill some dead code in mthca_eq.c Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit e51060f08a61965c4dd91516d82fe90617152590 tree 19a8a0cc519e215e12ce460258a356cdac842f6e parent 7025fcd36bd62af2c6ca0ea3490c00b216c4d168 author Sean Hefty Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB: IP address based RDMA connection manager Kernel connection management agent over InfiniBand that connects based on IP addresses. The agent defines a generic RDMA connection abstraction to support clients wanting to connect over different RDMA devices. The agent also handles RDMA device hotplug events on behalf of clients. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 7025fcd36bd62af2c6ca0ea3490c00b216c4d168 tree e2fda3944176fcafb24876680d6eb8b6be394fe6 parent a1e8733e557bb390e13aa00ef044a6022c8d0bb2 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 IB: address translation to map IP toIB addresses (GIDs) Add an address translation service that maps IP addresses to InfiniBand GID addresses using IPoIB. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit a1e8733e557bb390e13aa00ef044a6022c8d0bb2 tree 52f2d60bc33d19806ce0522c62d84fba33d80691 parent 6e61d04f2d8c7ac4f67e1f498ed2a2a3ad8edaa3 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 [NET]: Export ip_dev_find() Export ip_dev_find() to allow locating a net_device given an IP address. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6e61d04f2d8c7ac4f67e1f498ed2a2a3ad8edaa3 tree cf184fe1a9ebc7187cd452b2427234726436da94 parent 6a9af2e18a5c6ebcf8283309d20ac0e9fa35e346 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 IB/cm: Match connection requests based on private data Extend matching connection requests to listens in the InfiniBand CM to include private data checks. This allows applications to listen on the same service identifier, with private data directing the request to the appropriate application. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6a9af2e18a5c6ebcf8283309d20ac0e9fa35e346 tree 550bf42e4fff6b89160224fdf130085fefd0fe2e parent 4e56ea794ec8636991e21942fc2e0d071ea8ee1d author Sean Hefty Sat, 17 Jun 2006 20:37:27 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:27 -0700 IB: common handling for marshalling parameters to/from userspace Provide common handling for marshalling data between userspace clients and kernel InfiniBand drivers. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e56ea794ec8636991e21942fc2e0d071ea8ee1d tree eb03f5a3246c69fdaf6dd485395b13d33aef158d parent 13aa6ecb47990cfc78e20e347fdd3f1df6189426 author Michael S. Tsirkin Tue, 13 Jun 2006 17:19:42 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:20 -0700 IB/mthca: memfree completion with error FW bug workaround Memfree firmware is in rare cases reporting WQE index == base - 1 in receive completion with error, instead of (rq size - 1); base is 0 in mthca. Here is a patch to avoid kernel crash and report a correct WR id in this case. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 13aa6ecb47990cfc78e20e347fdd3f1df6189426 tree d26f2ed61becb6603aff5dc1467270a370483333 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Michael S. Tsirkin Mon, 12 Jun 2006 16:57:51 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:00 -0700 IB/mthca: restore missing PCI registers after reset mthca does not restore the following PCI-X/PCI Express registers after reset: PCI-X device: PCI-X command register PCI-X bridge: upstream and downstream split transaction registers PCI Express : PCI Express device control and link control registers This causes instability and/or bad performance on systems where one of these registers is set to a non-default value by BIOS. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit b5ed7639c9f502898af4109e778f5613dacbfd9c tree abe908c60ce1ea8f201028c9fc830cacd25c724b parent 0638dec01e89059c853515ab71c55fd13ba5a8ea parent eb35cf60e462491249166182e3e755d3d5d91a28 author Jeff Garzik Tue, 13 Jun 2006 20:29:04 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:29:04 -0400 Merge branch 'master' into upstream commit 0638dec01e89059c853515ab71c55fd13ba5a8ea tree 7743a5714b03ef408b3147475cfe61127d580ed3 parent 96e672c79fb114ec38a868dc864e743205c24332 author Herbert Valerio Riedel Thu, 01 Jun 2006 09:41:04 +0200 committer Jeff Garzik Sun, 11 Jun 2006 23:19:00 -0400 [PATCH] net: au1000_eth: PHY framework conversion convert au1000_eth driver to use PHY framework and garbage collected functions and identifiers that became unused/obsolete in the process Signed-off-by: Herbert Valerio Riedel Signed-off-by: Jeff Garzik commit 96e672c79fb114ec38a868dc864e743205c24332 tree 0bad9a61fdab616e7e4070dbfc972045b34b0954 parent a2bd2ec8d1bef7479d26d375162963106757e8e9 author Randy Dunlap Sat, 10 Jun 2006 13:33:48 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] 3c5zz ethernet: fix section warnings Priority: not critical; makes init code discardable. Fix section mismatch warnings: WARNING: drivers/net/3c501.o - Section mismatch: reference to .init.text:el1_probe from .text between 'init_module' (at offset 0x812) and 'cleanup_module' WARNING: drivers/net/3c503.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x661) and 'cleanup_card' WARNING: drivers/net/3c505.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x228d) and 'cleanup_module' WARNING: drivers/net/3c507.o - Section mismatch: reference to .init.text:el16_probe from .text between 'init_module' (at offset 0xa99) and 'cleanup_module' WARNING: drivers/net/3c523.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x12e7) and 'cleanup_module' WARNING: drivers/net/3c527.o - Section mismatch: reference to .init.text:mc32_probe from .text between 'init_module' (at offset 0xd8d) and 'cleanup_module' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit a2bd2ec8d1bef7479d26d375162963106757e8e9 tree dc68527991d0bdaddec167bbe8ab4119c82faf7e parent 29f9f6d234753da97b74402f746981c63ec0b2f0 author Randy Dunlap Sat, 10 Jun 2006 13:30:10 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] smc ethernet: fix section mismatch warnings Priority: not critical; makes init code discardable. Removes one duplicate assignment. Fix section mismatch warnings: WARNING: drivers/net/smc-ultra.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x369) and 'cleanup_card' WARNING: drivers/net/smc-ultra32.o - Section mismatch: reference to .init.text:ultra32_probe from .text between 'init_module' (at offset 0x254) and 'cleanup_module' WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.text:smc_init from .text between 'init_module' (at offset 0x997) and 'cleanup_module' WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.data: from .data between 'smcdev.0' (at offset 0x44) and '__param_str_io' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 29f9f6d234753da97b74402f746981c63ec0b2f0 tree e563c6e8b676255300e4f6fa9efc3a15fa458dc9 parent 5d1f16c6c4d64d1e4f53e277e39c0ada89f00a48 author Randy Dunlap Sat, 10 Jun 2006 13:32:12 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] hp ethernet: fix section mismatches Priority: not critical; makes init code discardable. Fix section mismatch warnings: WARNING: drivers/net/hp-plus.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x387) and 'cleanup_card' WARNING: drivers/net/hp.o - Section mismatch: reference to .init.data: from .text between 'hp_init_card' (at offset 0x310) and 'init_module' WARNING: drivers/net/hp.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x367) and 'cleanup_card' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 5d1f16c6c4d64d1e4f53e277e39c0ada89f00a48 tree be867e13fb4d36b740b5a306d965bef900ff3556 parent 282f33c98618a3877043ec9dd5ac777c5e7c117d author Randy.Dunlap Sat, 10 Jun 2006 12:13:35 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] Section mismatch in drivers/net/ne.o during modpost On Sat, 10 Jun 2006 14:11:42 +0200 (MEST) Mikael Pettersson wrote: > While compiling 2.6.17-rc6 for a 486 with an NE2000 ISA ethernet card, I got: > > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x158) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x176) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x183) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x1ea) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x251) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x266) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x29b) and 'ne_block_input' > > Not sure how serious this is; the driver seems to work fine later on. Doesn't look serious. init_module() is not __init, but it calls some __init functions and touches some __initdata. BTW, I would be happy to see some consistent results from modpost section checking. I don't see all of these warnings (I see only 1) when using gcc 3.3.6. What gcc version are you using? Does that matter? (not directed at anyone in particular) Patch below fixes it for me. Please test/report. Signed-off-by: Jeff Garzik commit 282f33c98618a3877043ec9dd5ac777c5e7c117d tree 2194a2b7b067f8718aa42486cc14f29062e19dae parent b89fa8b6d738d71c3a9eff584177bb7de13f33b9 author Linas Vepstas Thu, 08 Jun 2006 22:19:44 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:35:15 -0400 [PATCH] e1000: prevent statistics from getting garbled during reset If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. This patch presumes that an earlier patch, [PATCH] PCI Error Recovery: e1000 network device driver has already been applied. Signed-off-by: Linas Vepstas Cc: John Ronciak Cc: Jesse Brandeburg Cc: Jeff Kirsher Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b89fa8b6d738d71c3a9eff584177bb7de13f33b9 tree 7a46854faeb856065b8686f14c48a1d5e9a99011 parent c99ce7ee75db7836e2faba932affd2aadd1e942f author Andrew Morton Thu, 08 Jun 2006 22:19:41 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:34:40 -0400 [PATCH] smc911x Kconfig fix In file included from drivers/net/smc911x.c:84: drivers/net/smc911x.h:46:9: warning: "SMC_USE_16BIT" is not defined drivers/net/smc911x.h:60:9: warning: "SMC_USE_32BIT" is not defined drivers/net/smc911x.h:73:10: warning: "SMC_USE_PXA_DMA" is not defined drivers/net/smc911x.c: In function `smc911x_reset': drivers/net/smc911x.c:247: warning: implicit declaration of function `SMC_inl' drivers/net/smc911x.c:249: warning: implicit declaration of function `SMC_outl' Cc: Dustin McIntire Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c99ce7ee75db7836e2faba932affd2aadd1e942f tree f390bcb4658ba6149d72773f3963ee5599554968 parent ebe611a48378f8f5c347d86dc403a2d56c320f1c author Ayaz Abdulla Sat, 10 Jun 2006 22:48:28 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth: new device ids This patch contains new device ids for forcedeth ethernet. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit ebe611a48378f8f5c347d86dc403a2d56c320f1c tree 7c76f60f82b1434e5c79caf2000a10a1c9b10ea0 parent 69fe3fd7b1adac55f794cb2b34cb1c13a0b19f05 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:24 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: version This patch bumps up the version number for config support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 69fe3fd7b1adac55f794cb2b34cb1c13a0b19f05 tree 7c5e668c6bbb8a8b1abd17c3b5c649304023475c parent 9589c77a0de19c0c95370d5212eb1f9006d8abcb author Ayaz Abdulla Sat, 10 Jun 2006 22:48:18 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: module parameters This patch adds (and modifies) module parameter support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 9589c77a0de19c0c95370d5212eb1f9006d8abcb tree 428c84c41d0e53bef95577fbb74ef764e7b8be89 parent 7a1854b7977d36360fde4e06c2d9cedcc3dd0933 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:13 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: diagnostics This patch adds support for diagnostic tests through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 7a1854b7977d36360fde4e06c2d9cedcc3dd0933 tree 65bc7ef5a9df892f35436847dd2769bf075bad14 parent 52da35789c305f6f44d0e85b294a9845c1271898 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:08 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: move functions This patch moves a few functions (no logic change) so that the next patch has these functions defined. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 52da35789c305f6f44d0e85b294a9845c1271898 tree 08a3300452bdd23fbf2d835721fe64700739bd34 parent 5ed2616f621b41d3477d4f4ae2ba0e0a0e80bdce author Ayaz Abdulla Sat, 10 Jun 2006 22:48:04 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: statistics This patch exposes hardware statistic counters through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 5ed2616f621b41d3477d4f4ae2ba0e0a0e80bdce tree 3455e8f39b655cd9cef5c347fb345383be43b008 parent c42d9df932ce3732044dc1394114380140ccffe0 author Ayaz Abdulla Sat, 10 Jun 2006 22:47:59 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: csum This patch allows for configurable rx and tx checksum offloads through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit c42d9df932ce3732044dc1394114380140ccffe0 tree d268f5e64c67d4c4e8b88f7db2ab2b3a17be3143 parent f9430a015a4331ba950eba1d7661dcd876c29f3c author Ayaz Abdulla Sat, 10 Jun 2006 22:47:52 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: wol This patch fixes configuration bugs when modifying wol settings. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit f9430a015a4331ba950eba1d7661dcd876c29f3c tree 52433da933bc935fe3be5f5bf0cc617ca4ac017c parent b6d0773fa7943fd93d564056395a7ff29b81213b author Ayaz Abdulla Sat, 10 Jun 2006 22:47:47 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: phy This patch fixes configuration bugs when modifying phy settings. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit b6d0773fa7943fd93d564056395a7ff29b81213b tree 119a6000893c91ed6a5aa7c29d5e84bf1aeab069 parent eafa59f6bcc6e46b756198a5388d195c4f0e671a author Ayaz Abdulla Sat, 10 Jun 2006 22:47:42 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: flow control This patch allows for configurable flow control through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit eafa59f6bcc6e46b756198a5388d195c4f0e671a tree 9530cd65e90c8b53e1dd4293c30b5eced199ecee parent 6a78814f6c9e35e9b4815c1973c988555212d6ef author Ayaz Abdulla Sat, 10 Jun 2006 22:47:34 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: ring sizes This patch allows for configurable ring size through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6a78814f6c9e35e9b4815c1973c988555212d6ef tree d786e34f58b786664f0b776d2e82fecbd127b7b3 parent cac925a4aab1b7233d3beb591f53498816058a08 author Ayaz Abdulla Sat, 10 Jun 2006 22:47:26 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: tso cleanup There are a series of patches for configuration support in forcedeth and one patch for device ids. This patch is a cleanup of the a previous TSO patch. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 81c246691535ee3f865fbe6804b3be1b2c159e95 tree bee0ca28e848c223caa68cbf52f36c7045cdd81b parent b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 author Andrew Morton Thu, 01 Jun 2006 20:19:36 -0700 committer Dave Jones Thu, 08 Jun 2006 22:41:17 -0400 [AGPGART] alpha-agp warning fix drivers/char/agp/alpha-agp.c:138: warning: initialization from incompatible pointer type drivers/char/agp/alpha-agp.c:139: warning: initialization from incompatible pointer type Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 tree 480bdcd2ad5129bfd9e1ec216525a48a92eb3e51 parent 01af2fac9ea76513e2fba689ad580f985f32a8c3 author Andrew Morton Thu, 01 Jun 2006 20:19:35 -0700 committer Dave Jones Thu, 08 Jun 2006 22:41:16 -0400 [AGPGART] uninorth-agp warning fixes drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_suspend': drivers/char/agp/uninorth-agp.c:332: warning: cast to pointer from integer of different size drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_resume': drivers/char/agp/uninorth-agp.c:354: warning: cast from pointer to integer of different size Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit cac925a4aab1b7233d3beb591f53498816058a08 tree a800537068aa05fd426ff44b8efd52d66e6d2051 parent bcd618e4eac6fbf82de05d23c15ecb694c62b8af parent 6224e01dccf2543a8f8b4d825baf1510c79c2878 author Jeff Garzik Thu, 08 Jun 2006 15:56:17 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:56:17 -0400 Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp commit bcd618e4eac6fbf82de05d23c15ecb694c62b8af tree e1a85b6a5f10c7ac20ef3b3357e15c5802dca019 parent ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 parent cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a author Jeff Garzik Thu, 08 Jun 2006 15:55:45 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:55:45 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/net/e1000/e1000_ethtool.c commit ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 tree d770bd8c536771cb3804abb51ed029d7dd9d30d2 parent 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 parent 5c601d0c942f5aaf7f3cff7e08f61047d70a964e author Jeff Garzik Thu, 08 Jun 2006 15:48:25 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:48:25 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 tree 583b0c57ebd0cf99b916f7c32c4a03ea1e3f29a0 parent 987024ca9e11b5ea348e4014ac0e41fdee4f50f1 parent 2e84abe742c42f7b063b141db55e5793ce4c502c author Jeff Garzik Thu, 08 Jun 2006 15:46:38 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:46:38 -0400 Merge branch 'upstream-fixes' into upstream commit 987024ca9e11b5ea348e4014ac0e41fdee4f50f1 tree 4f10b14020029b6a6ba8db7b6a84c53749bf3748 parent 631ae320a4123898927ab1eb32ad81274a713488 author Stephen Hemminger Tue, 06 Jun 2006 10:11:15 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: version 1.6 Update version string. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 631ae320a4123898927ab1eb32ad81274a713488 tree 81c3e089f06a17efbc9f075bc8a875406492c9e2 parent 7c442fa17eabd34301598acbca8ecb99daad6027 author Stephen Hemminger Tue, 06 Jun 2006 10:11:14 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: dont allow bad hardware address from ROM Sometimes boards don't reset properly, and the address read out of the EEPROM is zero. Stop the insanity before the device gets registered. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7c442fa17eabd34301598acbca8ecb99daad6027 tree c77ff92e3c8e2eefddbc9bab112bdc01939dc020 parent 9db96479b4e682b1bc3796873589db1f8d38a9d5 author Stephen Hemminger Tue, 06 Jun 2006 10:11:13 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: transmit complete via IRQ not NAPI The transmit side code has a number of ring problems that caused some of the Bugzilla reports. Rather than trying to fix the details, it is safer to rewrite the code that handles transmit completion and freeing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9db96479b4e682b1bc3796873589db1f8d38a9d5 tree 67e962fc0c1a1a0d7d9eb51fa6d684bb220ba38a parent d85b514fd9aa95d2089fa16dccc25863fb2a766c author Stephen Hemminger Tue, 06 Jun 2006 10:11:12 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: TX low water mark definition Consolidate all usage of ring low water mark to one value. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d85b514fd9aa95d2089fa16dccc25863fb2a766c tree 7a46eaf6bfa9d745e821cedc51d9deb81b2d7108 parent b10c066823c97c0e40989b2048540e85f5190501 author Stephen Hemminger Tue, 06 Jun 2006 10:11:11 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: use workq for PHY handling Since accessing the PHY can take 100's of usecs, use a work queue to allow spinning in outside of soft/hard irq. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b10c066823c97c0e40989b2048540e85f5190501 tree 6e1dae7c49b009a21ceb0407188d4432fe009e15 parent d15a88fc21ef225768ce31be16edfc9c6e2e02e3 author Brice Goglin Thu, 08 Jun 2006 10:25:00 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:25:22 -0400 [PATCH] myri10ge update The following patch updates the myri10ge to 1.0.0, with the following changes: * Switch to dma_alloc_coherent API. * Avoid PCI burst when writing the firmware on chipset with unaligned completions. * Use ethtool_op_set_tx_hw_csum instead of ethtool_op_set_tx_csum. * Include linux/dma-mapping.h to bring DMA_32/64BIT_MASK on all architectures (was missing at least on alpha). * Some typo and warning fixes. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/net/myri10ge/myri10ge.c | 57 +++++++++++++++++++----------- 1 file changed, 37 insertions(+), 20 deletions(-) Signed-off-by: Jeff Garzik commit d15a88fc21ef225768ce31be16edfc9c6e2e02e3 tree d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d parent b53471711f21ba0e151075f0e1d6d531eb50f1b1 parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Jeff Garzik Thu, 08 Jun 2006 15:24:46 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:24:46 -0400 Merge branch 'master' into upstream commit 6224e01dccf2543a8f8b4d825baf1510c79c2878 tree 3d4c7e59b0e1ba7ac0f5eaf211c04049feb9fe1c parent 9026729bfeb4329a4edc01f427f01af7ee0a5273 author Auke Kok Thu, 08 Jun 2006 11:15:35 -0700 committer Auke Kok Thu, 08 Jun 2006 11:15:35 -0700 [DOC] Update bonding documentation with sysfs info Bonding documentation needed an update to include sysfs specific information. This patch adds information on how to change bonding parameters at runtime using the sysfs interface. Signed-off-by: Mitch Williams Signed-off-by: Auke Kok commit 9026729bfeb4329a4edc01f427f01af7ee0a5273 tree 956f921b9511b87da6337a9f169b4b5d14590fc6 parent 2cc304923d87403abc103a741382b9af08b6decc author Auke Kok Thu, 08 Jun 2006 09:30:24 -0700 committer Auke Kok Thu, 08 Jun 2006 09:30:24 -0700 e1000: add PCI Error Recovery Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel gigabit ethernet e1000 device driver. The patch has been tested, and appears to work well. Signed-off-by: Linas Vepstas Acked-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 2cc304923d87403abc103a741382b9af08b6decc tree f14d99c13a1b8960964dcfdb6a3774c628ab7042 parent 983f27d37d4fc72c252835cb2ee3103b360735a6 author Auke Kok Thu, 08 Jun 2006 09:30:18 -0700 committer Auke Kok Thu, 08 Jun 2006 09:30:18 -0700 e100: add PCI Error Recovery Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel ethernet e100 device driver. The patch has been tested, and appears to work well. Signed-off-by: Linas Vepstas Acked-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 72109368de7aaa5d489d9ca4641f4a11a6fc7653 tree 0ea8bd820daf11bea34c45f319c2ea0b848d166b parent 7a532c69c37dbb46bfd0276160e624f06552adfc author Dennis Munsie Wed, 07 Jun 2006 18:53:38 +1000 committer Dave Airlie Wed, 07 Jun 2006 18:53:38 +1000 Removed hard coded EDID buffer size. Signed-off-by: Dennis Munsie Acked-by: Antonino Daplas Signed-off-by: Dave Airlie commit 5c601d0c942f5aaf7f3cff7e08f61047d70a964e tree 0144bcb5291d5cd49192270b6ff192e21f661da7 parent ff7562aaec1e68448888572033f072fc21ef2ac8 author Pavel Machek Mon, 05 Jun 2006 16:13:30 -0400 committer John W. Linville Mon, 05 Jun 2006 16:13:30 -0400 [PATCH] wireless: move zd1201 where it belongs zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where noone can find it. This moves Kconfig/Makefile zd1201 to the right place. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit ff7562aaec1e68448888572033f072fc21ef2ac8 tree 16a39b85e2099081d9801fa0285a297199041f4d parent c4b3d1bb3206513d7f10cd60bbac97c82624c2d3 author Jason Lunz Sun, 04 Jun 2006 23:05:49 +0200 committer John W. Linville Mon, 05 Jun 2006 15:53:10 -0400 [PATCH] bcm43xx: quiet down log spam from set_security The debug logging in bcm43xx_ieee80211_set_security() is pretty noisy. Make it more silent. Signed-off-by: Jason Lunz Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit c4b3d1bb3206513d7f10cd60bbac97c82624c2d3 tree 33cd40b28136809c4fc462742c9f1519b4b2ed73 parent 6ae15df16ef3dc3f5f043e94bb2cd4aa6c7f2aa8 author Joseph Jezak Thu, 01 Jun 2006 17:12:49 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:30 -0400 [PATCH] softmac: unified capabilities computation This patch moves the capabilities field computation to a function for clarity and adds some previously unimplemented bits. Signed off by Joseph Jezak Signed-off-by: Daniel Drake Acked-By: Johannes Berg Signed-off-by: John W. Linville commit 6ae15df16ef3dc3f5f043e94bb2cd4aa6c7f2aa8 tree 4aaf3f6dd60df4dd712679e8594796dfd8322194 parent 76ea4c7f4cd319dee35934ecab57745feae58fa5 author Daniel Drake Thu, 01 Jun 2006 15:37:22 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:30 -0400 [PATCH] softmac: Fix handling of authentication failure My router blew up earlier, but exhibited some interesting behaviour during its dying moments. It was broadcasting beacons but wouldn't respond to any authentication requests. I noticed that softmac wasn't playing nice with this, as I couldn't make it try to connect to other networks after it had timed out authenticating to my ill router. To resolve this, I modified the softmac event/notify API to pass the event code to the callback, so that callbacks being notified from IEEE80211SOFTMAC_EVENT_ANY masks can make some judgement. In this case, the ieee80211softmac_assoc callback needs to make a decision based upon whether the association passed or failed. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 76ea4c7f4cd319dee35934ecab57745feae58fa5 tree 6151f9d89084a1e96f216a182ed3fc265dffd429 parent 47fbe1bf3980b41d2e18e3774e8e1094f716d2d1 author Daniel Drake Thu, 01 Jun 2006 15:34:26 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:29 -0400 [PATCH] softmac: complete shared key authentication This patch finishes of the partially-complete shared key authentication implementation in softmac. The complication here is that we need to encrypt a management frame during the authentication process. I don't think there are any other scenarios where this would have to happen. To get around this without causing too many headaches, we decided to just use software encryption for this frame. The softmac config option now selects IEEE80211_CRYPT_WEP so that we can ensure this available. This also involved a modification to some otherwise unused ieee80211 API. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 47fbe1bf3980b41d2e18e3774e8e1094f716d2d1 tree 6c6b7d7dfacfa9bff197aaa32773996f472d99a9 parent 2a8063403112030f1748e207d97d4f8654754dff author Toralf Förster Mon, 05 Jun 2006 15:48:31 -0400 committer John W. Linville Mon, 05 Jun 2006 15:48:31 -0400 [PATCH] ieee80211softmac_io.c: fix warning "defined but not used" Got this compiler warning and Johannes Berg wrote: Yeah, known 'bug', we have that code there but never use it. Feel free to submit a patch (to John Linville, CC netdev and softmac-dev) to remove it. Signed-off-by: Toralf Foerster Signed-off-by: John W. Linville commit 2a8063403112030f1748e207d97d4f8654754dff tree 5a6d789aaf243d96807a3a8431c4c741a469e318 parent f6882a0688ea83db5fc2f3491ac9fcdce0834cc7 author Pavel Machek Fri, 26 May 2006 22:07:48 +0200 committer John W. Linville Mon, 05 Jun 2006 15:34:18 -0400 [PATCH] usb wifi: zd1201 cleanups Cleanup coding style and other small stuff in zd1201. No real code changes. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit f6882a0688ea83db5fc2f3491ac9fcdce0834cc7 tree 19a30d557610787dc0520a2955852b4882056bdb parent dea58b80f2625d3712645fb6ff0af45866cedaae parent ea9a7719597e81a119a155178eabfc941eef11cc author John W. Linville Mon, 05 Jun 2006 15:31:57 -0400 committer John W. Linville Mon, 05 Jun 2006 15:31:57 -0400 Merge branch 'upstream-fixes' into upstream commit 6ccf58ab22499139bacc683493c9fd70af55adbb tree 5fd813e5eab0f24ccf7d908380ae347df0e7123e parent 436fe7b8b4a5016ef1fcb32bff77bde84003e15d author Dave Jones Mon, 05 Jun 2006 15:25:20 -0400 committer Dave Jones Mon, 05 Jun 2006 15:25:20 -0400 [CPUFREQ] sets nforce2 minimum PLL divider to 2. Sets minimum PLL divider to 2. No negative impact when tested with two nForce2 based boards. Alexander Choporov reported (06/01/06) that xdiv = 1 does not work on his Abit NF7S2. Although there shouldn't be much cases that lead to xdiv = 1. (Updates also the (C) year) Signed-off-by: Sebastian Witt Signed-off-by: Dave Jones commit dea58b80f2625d3712645fb6ff0af45866cedaae tree b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d parent b1141f6d5dead296adcabd4a1e8ea2b994e287cb parent 672c6108a51bf559d19595d9f8193dfd81f0f752 author John W. Linville Mon, 05 Jun 2006 14:42:27 -0400 committer John W. Linville Mon, 05 Jun 2006 14:42:27 -0400 Merge branch 'from-linus' into upstream commit 436fe7b8b4a5016ef1fcb32bff77bde84003e15d tree e9c366a5539fbdc13febc563001e4117353a815b parent b10eec2246690f069febd3aa9578decd5ffb3f5b author Dave Jones Mon, 05 Jun 2006 14:03:50 -0400 committer Dave Jones Mon, 05 Jun 2006 14:03:50 -0400 [CPUFREQ] Make powernow-k7 work on SMP kernels. Even though powernow-k7 doesn't work in SMP environments, it can work on an SMP configured kernel if there's only one CPU present, however recalibrate_cpu_khz was returning -EINVAL on such kernels, so we failed to init the cpufreq driver. Signed-off-by: Dave Jones commit b10eec2246690f069febd3aa9578decd5ffb3f5b tree 789c892dc6c2ec4e1aca1ab52fd068815c7f4692 parent 8c362a5d62c98ee117b229c3555f402e72f5c21e author Jan Beulich Fri, 28 Apr 2006 13:47:13 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] cpufreq core {d,}printk adjustments Remove KERN_* suffixes from some cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 8c362a5d62c98ee117b229c3555f402e72f5c21e tree 14e4795b4eead7fd6cb93c54e0d0a5fa018019ad parent 0fc25dd17eaea64b21612f8e2816a4695b418100 author Jan Beulich Wed, 26 Apr 2006 15:41:22 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino Remove KERN_* suffixes from some Centrino cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 0fc25dd17eaea64b21612f8e2816a4695b418100 tree 865a26fe983d26fb93296db6ce2566f1c1c95ca0 parent 1f729e0660f974cec1f0f7f4fba03ea4c2c4b9a9 author Jan Beulich Wed, 26 Apr 2006 15:40:02 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] dprintk adjustments to cpufreq-nforce2 Remove KERN_* suffixes from some NForce2 cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 1f729e0660f974cec1f0f7f4fba03ea4c2c4b9a9 tree 9254031f1f252e5b38c962b3e2ed93a0351ce319 parent 911cb74bb9e77e40749abc2fca6fe74d87d940f3 author Dave Jones Sun, 04 Jun 2006 19:37:58 -0400 committer Dave Jones Sun, 04 Jun 2006 19:37:58 -0400 [CPUFREQ] Prepare powernow-k8 for future CPUs. Forthcoming AMD products will use a different algorithm for transitioning pstates than the current generation Opteron products do. The attached patch allows the powernow-k8 driver to work with those products. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 911cb74bb9e77e40749abc2fca6fe74d87d940f3 tree 19e5fe6f750315a94abf5057a0ea41947f2c92bb parent 75de7d55f8e148848cadefc92140d8f083d13924 author Dave Jones Thu, 01 Jun 2006 11:38:28 -0400 committer Dave Jones Thu, 01 Jun 2006 11:38:28 -0400 [CPUFREQ] Make acpi-cpufreq 'sticky'. This prevents annoying messages being printed when it gets loaded on a machine that doesn't have support scaling via ACPI. Signed-off-by: Dave Jones commit 75de7d55f8e148848cadefc92140d8f083d13924 tree cd25015b00d398c8274db81e9f49ea7e4570f914 parent 484944a5b002cf87b38a8f073d37afcfb8afff28 author Dave Jones Wed, 31 May 2006 16:13:14 -0400 committer Dave Jones Wed, 31 May 2006 16:13:14 -0400 [CPUFREQ] Remove strange No-op from longrun.c ORing something with zero is meaningless. ACKed-by: Dominik Brodowski Signed-off-by: Dave Jones commit 01af2fac9ea76513e2fba689ad580f985f32a8c3 tree d43148c46bc3fcf25b61813751f253953d7a31ce parent 89197e34ea63d7f619dade525de8e69a15f40405 author Dave Jones Tue, 30 May 2006 18:22:07 -0400 committer Dave Jones Tue, 30 May 2006 18:22:07 -0400 [AGPGART] Remove pointless initialisation in intel-agp Signed-off-by: Dave Jones commit 89197e34ea63d7f619dade525de8e69a15f40405 tree 217fb21dc00b3172e64ebe127f233ebf62e08e31 parent e60a48f5ab35737118e19bc965c640900a842f02 author Dave Jones Tue, 30 May 2006 18:19:39 -0400 committer Dave Jones Tue, 30 May 2006 18:19:39 -0400 [AGPGART] Remove pointless code from agp_generic_create_gatt_table() Signed-off-by: Dave Jones commit 484944a5b002cf87b38a8f073d37afcfb8afff28 tree 40a960d5b4bee4ea5e4bafb2f1017f5d98484b87 parent 5557976ca97c3a3002805f575a45ad354e1050ff author Dave Jones Tue, 30 May 2006 18:09:31 -0400 committer Dave Jones Tue, 30 May 2006 18:09:31 -0400 [CPUFREQ] Remove more freq_table reinitialisations. Signed-off-by: Dave Jones commit 5557976ca97c3a3002805f575a45ad354e1050ff tree 7357b8341c36e7f4448e71cc8ae37a448e81cf4b parent 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 author Dave Jones Tue, 30 May 2006 17:59:48 -0400 committer Dave Jones Tue, 30 May 2006 17:59:48 -0400 [CPUFREQ] Fix another redundant initialisation in freq_table Signed-off-by: Dave Jones commit 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 tree 278afd3f9be8f7ac3c58d1fa4d37d73569bb410c parent 511e9ee17099c6ebe315c0524b8b482d4767ab3d author Dave Jones Tue, 30 May 2006 17:58:41 -0400 committer Dave Jones Tue, 30 May 2006 17:58:41 -0400 [CPUFREQ] Remove duplicate assignment in freq_table Signed-off-by: Dave Jones commit 511e9ee17099c6ebe315c0524b8b482d4767ab3d tree 7eb8bb99ddfbe5dfe4cd96735275405c7efcccc2 parent 851777b7b686c80e417fd811cdea3e5aa5305745 author Dave Jones Tue, 30 May 2006 17:57:14 -0400 committer Dave Jones Tue, 30 May 2006 17:57:14 -0400 [CPUFREQ] CodingStyle nits in cpufreq_stats.c Signed-off-by: Dave Jones commit 851777b7b686c80e417fd811cdea3e5aa5305745 tree f5aef4b3d86b0a2077a998a6ab44d8c67a9c355d parent b6571da9f328999a6bce429b5f614a3d64b926ee author Dave Jones Tue, 30 May 2006 17:55:01 -0400 committer Dave Jones Tue, 30 May 2006 17:55:01 -0400 [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 Signed-off-by: Dave Jones commit b6571da9f328999a6bce429b5f614a3d64b926ee tree ef017bddd20db6e0363575ed77c1c4fa524edfa2 parent 83844510ec9dc89a676e71d3cc28289905c2caec author Dave Jones Tue, 30 May 2006 17:50:22 -0400 committer Dave Jones Tue, 30 May 2006 17:50:22 -0400 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq Signed-off-by: Dave Jones commit 83844510ec9dc89a676e71d3cc28289905c2caec tree a90113ca845785c4f014683f6f85aa8464d01ceb parent 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 author Dave Jones Tue, 30 May 2006 17:43:54 -0400 committer Dave Jones Tue, 30 May 2006 17:43:54 -0400 [CPUFREQ] Remove pointless reinitialisation from powernow-k8 This var is already set at entry to the function. Signed-off-by: Dave Jones commit 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 tree 49527b033c491cccef897054dfdcbc62baf35aac parent e2aa8732ac11570acddf326874a34ab684752e34 author Dave Jones Tue, 30 May 2006 17:40:16 -0400 committer Dave Jones Tue, 30 May 2006 17:40:16 -0400 [CPUFREQ] Remove redundant initialisation from longhaul. Signed-off-by: Dave Jones commit e2aa8732ac11570acddf326874a34ab684752e34 tree 968a22e50a92b280ada993d5e92c6f2d3d120b57 parent 8cbe0169053ffa185ad349088eb0901946c14a09 author Dave Jones Tue, 30 May 2006 17:37:15 -0400 committer Dave Jones Tue, 30 May 2006 17:37:15 -0400 [CPUFREQ] Clean up longhaul's speed pretty-printer Getting ready to move to core cpufreq. - Use snprintf - Remove unnecessary nesting improving readability. Signed-off-by: Dave Jones commit 8cbe0169053ffa185ad349088eb0901946c14a09 tree efb5c0ab82e411027499a7f133eeecf79dad6f99 parent 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a author Dave Jones Tue, 30 May 2006 17:26:08 -0400 committer Dave Jones Tue, 30 May 2006 17:26:08 -0400 [CPUFREQ] Disambiguate loop indexes in powernow-k7 This shouldn't have actually caused any problems (as we return if we 'corrupt' 'i', but it's still not very pretty. For the sake of adding another local variable, this got cleaner. Signed-off-by: Dave Jones commit 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a tree 76c120be357ec972173df880ac9211914f040bce parent e60a48f5ab35737118e19bc965c640900a842f02 author Dave Jones Tue, 30 May 2006 17:25:14 -0400 committer Dave Jones Tue, 30 May 2006 17:25:14 -0400 [CPUFREQ] Typo in powernow-k8 (Also fix some horked indentation) Signed-off-by: Dave Jones commit 7a532c69c37dbb46bfd0276160e624f06552adfc tree f397e591c22fc727c0784d0754f22f4a09de476b parent 56e004e5435c008728b1444b51d757da2e098976 author Dennis Munsie Mon, 29 May 2006 18:58:09 +1000 committer Dave Airlie Mon, 29 May 2006 18:58:09 +1000 intelfb: use regular modedb table instead of VESA intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 56e004e5435c008728b1444b51d757da2e098976 tree 2c68226e34c739e1802aa07166ae0161ce72eb23 parent 080a416802153dbbb20ab4f4fa1225867096d071 author Antonino A. Daplas Mon, 29 May 2006 18:49:08 +1000 committer Dave Airlie Mon, 29 May 2006 18:49:08 +1000 intelfb: use firmware EDID for mode database Use firmware EDID for the driver's private mode database. Signed-off-by: Antonino Daplas Cc: Sylvain Meyer Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 080a416802153dbbb20ab4f4fa1225867096d071 tree 519f0ae3e845403b237c4a16ed8e3eaa5e3a165a parent 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 author Dave Airlie Mon, 29 May 2006 18:45:19 +1000 committer Dave Airlie Mon, 29 May 2006 18:45:19 +1000 Revert "intelfb driver -- use the regular modedb table instead of the VESA" This reverts 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 commit. This conflicts with a patch in -mm from Antonino reapply later. Signed-off-by: Dave Airlie commit 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 tree 70e7f3025cd2511fca6bf09a512588fbbbfab5c7 parent f728377f6786bcdf1dbf33394360164e86f40094 author Eric Hustvedt Mon, 29 May 2006 18:38:55 +1000 committer Dave Airlie Mon, 29 May 2006 18:38:55 +1000 intelfb: int option fix Fix integer option parsing in the intelfb driver. The macro wasn't accounting for the equal sign past the option name. As a result, the vram option always returned 0. Signed-off-by: Eric Hustvedt Signed-off-by: Dennis Munsie commit b53471711f21ba0e151075f0e1d6d531eb50f1b1 tree e912dbe14b6af76b0ebe853a9976c99616bb8a4c parent 983f27d37d4fc72c252835cb2ee3103b360735a6 parent 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b author Jeff Garzik Sun, 28 May 2006 16:35:13 -0400 committer Jeff Garzik Sun, 28 May 2006 16:35:13 -0400 Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b tree 0fbffb32574f00e1326c1aad4832c63b4aaeea70 parent 371858568e02698fe2de8ba4bf771e3f40db69e5 author Jay Cliburn Wed, 24 May 2006 00:02:51 +0200 committer Francois Romieu Sat, 27 May 2006 21:26:13 +0200 via-velocity: allow MTU size less than 1500 bytes Change the minimum allowable MTU size from 1500 bytes to 64 bytes. Signed-off-by: Jay Cliburn commit f728377f6786bcdf1dbf33394360164e86f40094 tree e1651c2772f53ebe28f135c024b619834ae5eca2 parent c9daa873c3a7c769821ec6c8258adf098bb0435c author Dave Airlie Sat, 27 May 2006 18:56:02 +1000 committer Dave Airlie Sat, 27 May 2006 18:56:02 +1000 sync modesetting code with X.org Signed-off-by: Dave Airlie commit c9daa873c3a7c769821ec6c8258adf098bb0435c tree 4867272494138d1c6a4975caa7e61dc49c8ae26f parent 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 author Dave Airlie Sat, 27 May 2006 18:44:02 +1000 committer Dave Airlie Sat, 27 May 2006 18:44:02 +1000 intelfb: align with changes from my X driver. This just realigns the PLL calculation routines with the ones from my X.org driver. Signed-off-by: Dave Airlie commit 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 tree 35eab865ff670a01e638f0584605f14d6ce68cd0 parent 1aecb393091d3c0787f92445420d96ef58c9782a author Dennis Munsie Sat, 27 May 2006 18:33:35 +1000 committer Dave Airlie Sat, 27 May 2006 18:33:35 +1000 intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 1aecb393091d3c0787f92445420d96ef58c9782a tree ad1a929d79f6219b461ab037105f0b52380bc41d parent df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f author Eric Hustvedt Sat, 27 May 2006 18:30:00 +1000 committer Dave Airlie Sat, 27 May 2006 18:30:00 +1000 Adds support for 256MB aperture on 945 chipsets to the intelfb driver and corrects calculation of stolen memory overhead. Signed-off-by: Eric Hustvedt Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f tree 83f7f6768ac730231386fdbf70f30c165d3cb134 parent 51d797474f87b375819d084f7583a2864c5656c4 author Dennis Munsie Sat, 27 May 2006 18:17:52 +1000 committer Dave Airlie Sat, 27 May 2006 18:17:52 +1000 intelfb -- uses stride alignment of 64 on the 9xx chipsets. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 983f27d37d4fc72c252835cb2ee3103b360735a6 tree 8a7d3c3e251db494e285896debeb906473178a3e parent de1e938e54deba5b093a3074dfafd0d11afacbe1 parent e82b0f2cc21be905e504573483fa9542b15df96f author Jeff Garzik Fri, 26 May 2006 22:01:26 -0400 committer Jeff Garzik Fri, 26 May 2006 22:01:26 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/s390/net/ctctty.c commit de1e938e54deba5b093a3074dfafd0d11afacbe1 tree 2740ac2cc161bb07a408a761afa961c713a37d9d parent f3b197ac26ed0e57989856494c495818dcc7f9ac author Yoichi Yuasa Thu, 25 May 2006 10:24:46 +0900 committer Jeff Garzik Fri, 26 May 2006 21:47:15 -0400 [PATCH] r8169: add new PCI ID Hi, This patch add new PCI ID for r8169 driver. RTL8110SBL has this PCI ID. Please aply. Yoichi Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit f3b197ac26ed0e57989856494c495818dcc7f9ac tree 5451adb0bc6c219d0a794ea32e3c598740c82bdf parent 4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b author Jeff Garzik Fri, 26 May 2006 21:39:03 -0400 committer Jeff Garzik Fri, 26 May 2006 21:39:03 -0400 [netdrvr] trim trailing whitespace: 8139*.c, epic100, forcedeth, tulip/* commit 4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b tree 5275fe083a58dece97502c64a49b99a743e865fd parent eb91f61b2294ccdb914df255164ada70dbbf2d58 author Ayaz Abdulla Thu, 25 May 2006 13:10:38 -0400 committer Jeff Garzik Fri, 26 May 2006 21:37:54 -0400 [PATCH] pci_ids: add new device ids This patch adds new device ids for MCP61 and MCP65 chips. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit eb91f61b2294ccdb914df255164ada70dbbf2d58 tree 7cfe3bb749c26fe02864687301c262acb9211b0c parent 48cf270e45ff6ff076dd6557b38ec1068dd71809 author Ayaz Abdulla Wed, 24 May 2006 18:13:19 -0400 committer Jeff Garzik Fri, 26 May 2006 21:37:54 -0400 [PATCH] forcedeth: add support for flow control This patch adds flow control support for tx and rx pause frames in forcedeth. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 48cf270e45ff6ff076dd6557b38ec1068dd71809 tree 26da9f40dc45385277ea33fb54b93f16e6dc0e89 parent f29cb26c43d7c064421e76540b7654fbba9efc78 author Jens Osterkamp Wed, 24 May 2006 23:33:11 +0200 committer Jeff Garzik Fri, 26 May 2006 21:33:58 -0400 [PATCH] spidernet: replace whitespaces by tabs The original patch was using whitespaces instead of tabs. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit f29cb26c43d7c064421e76540b7654fbba9efc78 tree de6a1c292e4e5be0ebedc21cae6130a421c8590f parent 6d0c07cc6eec4636d83dd75c85b3205229f1960a parent a24b163b7c16f9e30e726319115e45ed6e683582 author Jeff Garzik Fri, 26 May 2006 21:33:55 -0400 committer Jeff Garzik Fri, 26 May 2006 21:33:55 -0400 Merge branch 'upstream-fixes' into upstream commit 6d0c07cc6eec4636d83dd75c85b3205229f1960a tree be9f17d81216d3fdf3cbd5ce659c43d523876eb8 parent 6082823632e40737515d03381e1ba59cfb4d4909 parent 80871e63e410c53524ef47eaf475c13e0f164ea6 author Jeff Garzik Fri, 26 May 2006 21:32:31 -0400 committer Jeff Garzik Fri, 26 May 2006 21:32:31 -0400 Merge branch 'upstream-fixes' into upstream commit 6082823632e40737515d03381e1ba59cfb4d4909 tree be9f17d81216d3fdf3cbd5ce659c43d523876eb8 parent cbc696a5fa3942aa2e6ad52a71d5126ffa84d031 author Alexey Dobriyan Tue, 23 May 2006 14:52:21 -0700 committer Jeff Garzik Fri, 26 May 2006 21:29:09 -0400 [PATCH] e1000: endian fixes Signed-off-by: Alexey Dobriyan Cc: "Ronciak, John" Cc: Jesse Brandeburg Acked-by: Auke Kok Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit cbc696a5fa3942aa2e6ad52a71d5126ffa84d031 tree 98eab655c0e5d0853267557616cb7059f27f7fc9 parent d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 parent 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 author Jeff Garzik Fri, 26 May 2006 21:26:34 -0400 committer Jeff Garzik Fri, 26 May 2006 21:26:34 -0400 Merge branch 'upstream-fixes' into upstream commit b1141f6d5dead296adcabd4a1e8ea2b994e287cb tree d943fdb68114edcf67223659764ef458860eebbd parent f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 parent 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c author John W. Linville Fri, 26 May 2006 16:12:24 -0400 committer John W. Linville Fri, 26 May 2006 16:12:24 -0400 Merge branch 'upstream-fixes' into upstream commit f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 tree a453a270fc86ada85d808487c911387739ce2296 parent df8ccb9bf1ca360581a94c2245efb9fa613fbb29 parent 705af309505681f197f81618440954d10f120dc0 author John W. Linville Fri, 26 May 2006 16:06:58 -0400 committer John W. Linville Fri, 26 May 2006 16:06:58 -0400 Merge branch 'from-linus' into upstream commit d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 tree 9d2c162e6accb605a14d6307b545439e84de7178 parent 25a9f2f154feaf1c86e46a8fe7b9940d0b0a96f6 author Auke Kok Fri, 26 May 2006 09:38:10 -0700 committer Auke Kok Fri, 26 May 2006 09:38:10 -0700 ixgb: update version, dates increase the year dates to 2006 and bump the version to 1.0.109-k2 Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 25a9f2f154feaf1c86e46a8fe7b9940d0b0a96f6 tree 3a78f7cfff8f4d5bc804f5d26ef2fcdc03926a37 parent 25943071b40580ba24e0a111e86b4869b9f5c07c author Auke Kok Fri, 26 May 2006 09:36:03 -0700 committer Auke Kok Fri, 26 May 2006 09:36:03 -0700 ixgb: remove changelog same as e1000 - remove the changelog from the driver code itself. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 25943071b40580ba24e0a111e86b4869b9f5c07c tree d0a098bec435e4a7db0bc3f043273ae189c324e1 parent 235949d162076832b8b9a6e30ca51876c3fa11e8 author Auke Kok Fri, 26 May 2006 09:35:57 -0700 committer Auke Kok Fri, 26 May 2006 09:35:57 -0700 ixgb: replace netdev->priv with netdev_priv() fix netdev->priv ==> netdev_priv(netdev) Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 235949d162076832b8b9a6e30ca51876c3fa11e8 tree e9f666fa8e4cd6f41287295665a55e7b68d5536d parent 3352a3b20ce880b17f185ad55bf27751f1c8edb9 author Auke Kok Fri, 26 May 2006 09:35:52 -0700 committer Auke Kok Fri, 26 May 2006 09:35:52 -0700 ixgb: remove inlines, allow compiler to choose deinline a few large functions as to allow the compiler to pick. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3352a3b20ce880b17f185ad55bf27751f1c8edb9 tree 48b968af4adf8fd1bea134c64f888b53c8fe8436 parent 3f3dc0dd2086402b684545d66bb5ece93c76330b author Auke Kok Fri, 26 May 2006 09:35:47 -0700 committer Auke Kok Fri, 26 May 2006 09:35:47 -0700 ixgb: remove lock access in the fast path This mimics a change made in the e1000 driver that imitates a slick tg3 way of avoiding grabbing the lock around restarting the tx queue. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3f3dc0dd2086402b684545d66bb5ece93c76330b tree 623c09c2cfc13bfe31c15afe22ce3ab223c4763f parent 989316ddfeafd0e8fb51a4d811383769ad62637a author Auke Kok Fri, 26 May 2006 09:35:43 -0700 committer Auke Kok Fri, 26 May 2006 09:35:43 -0700 ixgb: allocate only buffersize needed In order to help correct window size growth, use the MFS register to limit the packet sizes received and allocate only the buffer size necessary Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak index 0905a82..84a8064 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -574,9 +574,8 @@ ixgb_sw_init(struct ixgb_adapter *adapte hw->subsystem_vendor_id = pdev->subsystem_vendor; hw->subsystem_id = pdev->subsystem_device; - adapter->rx_buffer_len = IXGB_RXBUFFER_2048; - hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH; + adapter->rx_buffer_len = hw->max_frame_size; if((hw->device_id == IXGB_DEVICE_ID_82597EX) || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4) @@ -820,21 +819,14 @@ ixgb_setup_rctl(struct ixgb_adapter *ada rctl |= IXGB_RCTL_SECRC; - switch (adapter->rx_buffer_len) { - case IXGB_RXBUFFER_2048: - default: + if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048) rctl |= IXGB_RCTL_BSIZE_2048; - break; - case IXGB_RXBUFFER_4096: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096) rctl |= IXGB_RCTL_BSIZE_4096; - break; - case IXGB_RXBUFFER_8192: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192) rctl |= IXGB_RCTL_BSIZE_8192; - break; - case IXGB_RXBUFFER_16384: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384) rctl |= IXGB_RCTL_BSIZE_16384; - break; - } IXGB_WRITE_REG(&adapter->hw, RCTL, rctl); } @@ -1551,25 +1543,12 @@ ixgb_change_mtu(struct net_device *netde DPRINTK(PROBE, ERR, "Invalid MTU setting %d\n", new_mtu); return -EINVAL; } - - if((max_frame <= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) - || (max_frame <= IXGB_RXBUFFER_2048)) { - adapter->rx_buffer_len = IXGB_RXBUFFER_2048; - - } else if(max_frame <= IXGB_RXBUFFER_4096) { - adapter->rx_buffer_len = IXGB_RXBUFFER_4096; - } else if(max_frame <= IXGB_RXBUFFER_8192) { - adapter->rx_buffer_len = IXGB_RXBUFFER_8192; + adapter->rx_buffer_len = max_frame; - } else { - adapter->rx_buffer_len = IXGB_RXBUFFER_16384; - } - netdev->mtu = new_mtu; - - if(old_max_frame != max_frame && netif_running(netdev)) { + if ((old_max_frame != max_frame) && netif_running(netdev)) { ixgb_down(adapter, TRUE); ixgb_up(adapter); } commit 989316ddfeafd0e8fb51a4d811383769ad62637a tree 42ac64d569fcd2690b9db631272abc33cb08604b parent 8556f0d18923495ffd15ce87089312b3d8f2414c author Auke Kok Fri, 26 May 2006 09:35:38 -0700 committer Auke Kok Fri, 26 May 2006 09:35:38 -0700 ixgb: revert an unwanted fix regarding tso/descriptors There seemed to be another bug introduced as well as a performance hit with the addtion of the sentinel descriptor workaround. Removal of this workaround appears to prevent the hang. We'll take a risk and remove it, as we had never seen the originally reported bug under linux. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 8556f0d18923495ffd15ce87089312b3d8f2414c tree dda1069465bffa70e35a293d46ccc9c54064e5d7 parent e59d16965ca38df91c4d9390d8eb5a62d7739589 author Auke Kok Fri, 26 May 2006 09:35:32 -0700 committer Auke Kok Fri, 26 May 2006 09:35:32 -0700 ixgb: fix interface losing macaddr on ifdn/up user contributed fix for LAA across down/up, from tonychung00@users.sf.net. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e59d16965ca38df91c4d9390d8eb5a62d7739589 tree 430dd5d0174c4a7c566d8f176599b4a1c324c8c7 parent a24e2513c2d03c9a92739ec6fa7e7208f792881e author Auke Kok Fri, 26 May 2006 09:35:28 -0700 committer Auke Kok Fri, 26 May 2006 09:35:28 -0700 ixgb: fix smp polling race condition Moved interrupt masking to before requesting the interrupt from the OS. Moved interrupt enable to after netif_poll_enable. This fixes a racy BUG() where polling would be running on another CPU at the same time that netif_poll_enable would run. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit a24e2513c2d03c9a92739ec6fa7e7208f792881e tree 31c7dbbc3fa76087d215924d2143fefa271cfa01 parent 6b900bb4bcb6095339f8d404babd9d779bfa1ea4 author Auke Kok Thu, 25 May 2006 13:24:27 -0700 committer Auke Kok Thu, 25 May 2006 13:24:27 -0700 ixgb: increment version to 1.0.104-k4 Increment the driver version to 1.0.104-k4 Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 6b900bb4bcb6095339f8d404babd9d779bfa1ea4 tree c3c727be5c0b9d99e8c01eae16412d0ad43e9c48 parent 1dfdd7df21309e57867962020a5ccb83d00e5432 author Auke Kok Thu, 25 May 2006 13:24:21 -0700 committer Auke Kok Thu, 25 May 2006 13:24:21 -0700 ixgb: use rx copybreak/skb recycle o use rx copybreak/skb recycle Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 1dfdd7df21309e57867962020a5ccb83d00e5432 tree 6e04f530caa49cbc4957fcad1429fe9bb77fe5d9 parent c9e055ac4fdbb52622437e0dbfdbc1d4897d2775 author Auke Kok Thu, 25 May 2006 13:24:17 -0700 committer Auke Kok Thu, 25 May 2006 13:24:17 -0700 ixgb: add performance enhancements to the buffer_info struct o modify the rx refill logic and tail bump o add counter for failures Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit c9e055ac4fdbb52622437e0dbfdbc1d4897d2775 tree 42b5a2fba2fd06d24dda9b6ca7667645940ac5d1 parent d7fbeba60b4021dfaf5d315884fbf7672b4ae87b author Herbert Valerio Riedel Sun, 07 May 2006 23:22:53 +0200 committer Jeff Garzik Wed, 24 May 2006 02:51:33 -0400 [PATCH] phy: new SMSC LAN83C185 PHY driver new SMSC LAN83C185 10BaseT/100BaseTX PHY driver for the PHY subsystem Signed-off-by: Herbert Valerio Riedel Signed-off-by: Jeff Garzik commit d7fbeba60b4021dfaf5d315884fbf7672b4ae87b tree 1da0475fa710af806a2a83d6ee9f6d16c144a028 parent 860f242eb5340d0b0cfe243cb86b2a98f92e8b91 author Jeff Garzik Wed, 24 May 2006 01:31:14 -0400 committer Jeff Garzik Wed, 24 May 2006 01:31:14 -0400 [netdrvr ibmlana, ibmveth] trim trailing whitespace commit 860f242eb5340d0b0cfe243cb86b2a98f92e8b91 tree 286d64b4acfc392bcb926a6f5f7bfb311b0d3efc parent 7b32a312895c00ff03178e49db8b651ee1e48178 author Santiago Leon Tue, 25 Apr 2006 11:19:59 -0500 committer Jeff Garzik Wed, 24 May 2006 01:30:37 -0400 [PATCH] ibmveth change buffer pools dynamically This patch provides a sysfs interface to change some properties of the ibmveth buffer pools (size of the buffers, number of buffers per pool, and whether a pool is active). Ethernet drivers use ethtool to provide this type of functionality. However, the buffers in the ibmveth driver can have an arbitrary size (not only regular, mini, and jumbo which are the only sizes that ethtool can change), and also ibmveth can have an arbitrary number of buffer pools Under heavy load we have seen dropped packets which obviously kills TCP performance. We have created several fixes that mitigate this issue, but we definitely need a way of changing the number of buffers for an adapter dynamically. Also, changing the size of the buffers allows users to change the MTU to something big (bigger than a jumbo frame) greatly improving performance on partition to partition transfers. The patch creates directories pool1...pool4 in the device directory in sysfs, each with files: num, size, and active (which default to the values in the mainline version). Comments and suggestions are welcome... -- Santiago A. Leon Power Linux Development IBM Linux Technology Center Signed-off-by: Jeff Garzik commit 7b32a312895c00ff03178e49db8b651ee1e48178 tree 4a5b3b4fa62eaee004ea162fa6676a18f142363a parent 75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45 author Adrian Bunk Tue, 16 May 2006 17:30:50 +0200 committer Jeff Garzik Wed, 24 May 2006 01:28:14 -0400 [PATCH] drivers/net/s2io.c: make bus_speed[] static On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote: >... > Changes since 2.6.17-rc3-mm1: >... > git-netdev-all.patch >... > git trees >... This patch makes the needlessly global bus_speed[] static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45 tree f4862aa47af8b5752b0d303a80ab78d6411ec99f parent db21e578e551421d76641d72cb3f8296ed3f9e61 parent a1433ac4ab46fb23ae77804c207a1f710a7b12f1 author Jeff Garzik Wed, 24 May 2006 01:28:05 -0400 committer Jeff Garzik Wed, 24 May 2006 01:28:05 -0400 Merge branch 'upstream-fixes' into upstream commit db21e578e551421d76641d72cb3f8296ed3f9e61 tree 73968aeda7ed0051b5cff6950ad513011a3c7a5f parent 6ed14254cb6e269030ff09bed8673473b7be0283 parent df8ccb9bf1ca360581a94c2245efb9fa613fbb29 author Jeff Garzik Wed, 24 May 2006 00:29:57 -0400 committer Jeff Garzik Wed, 24 May 2006 00:29:57 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 6ed14254cb6e269030ff09bed8673473b7be0283 tree a5a994f9f1afccfcc8d7b98a32e47d82cc90b5fb parent cf393ebed0abb1186c34b21f3d1d939ac2b5568a author Jeff Garzik Wed, 24 May 2006 00:28:37 -0400 committer Jeff Garzik Wed, 24 May 2006 00:28:37 -0400 [netdrvr pcnet_cs, myri] trim trailing whitespace commit cf393ebed0abb1186c34b21f3d1d939ac2b5568a tree 1a3042dfd0d55fbb36fe86da7f7b7f028e79e895 parent 0da34b6dfe55810ae60db57e08e2af8a808c0a55 author Marcin Juszkiewicz Tue, 23 May 2006 11:15:57 +0200 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] pcnet_cs: Add TRENDnet TE-CF100 ethernet adapter ID Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list. product info: "Fast Ethernet", "CF Size PC Card", "1.0", "" manfid: 0x0149, 0xc1ab Signed-off-by: Marcin Juszkiewicz drivers/net/pcmcia/pcnet_cs.c | 2 ++ 1 file changed, 2 insertions(+) Signed-off-by: Jeff Garzik commit 0da34b6dfe55810ae60db57e08e2af8a808c0a55 tree 4a62f33ee86aba9245bd1356b64a5e797cfde967 parent 3a720d726a6aa0a7cd9190f694587adf7bafdf4f author Brice Goglin Tue, 23 May 2006 06:10:15 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] Add Myri-10G Ethernet driver Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/net/Kconfig | 17 drivers/net/Makefile | 1 drivers/net/myri10ge/Makefile | 5 drivers/net/myri10ge/myri10ge.c | 2851 +++++++++++++++ drivers/net/myri10ge/myri10ge_mcp.h | 205 + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 58 include/linux/pci_ids.h | 1 7 files changed, 3138 insertions(+) Signed-off-by: Jeff Garzik commit 3a720d726a6aa0a7cd9190f694587adf7bafdf4f tree 2162cbeb1786c8f7826c7e19850bae52395dacea parent d99ef36ed7e56f816a235f1af115420a81853fb9 author Brice Goglin Tue, 23 May 2006 06:10:01 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] Revive pci_find_ext_capability This patch revives pci_find_ext_capability (has been disabled a couple month ago since it was not used anywhere. See http://lkml.org/lkml/2006/1/20/247). It will now be used by the myri10ge driver. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/pci/pci.c | 3 +-- include/linux/pci.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik commit d99ef36ed7e56f816a235f1af115420a81853fb9 tree d752c659a59a3f89f3add7f13ca5b8b5d424a4fe parent bdad69b23c86e41262b85d8affc9a3b34ee2ee74 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Jeff Garzik Wed, 24 May 2006 00:27:05 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:05 -0400 Merge branch 'master' into upstream commit bdad69b23c86e41262b85d8affc9a3b34ee2ee74 tree 1998fc609e8c614247db8b617e194a746e2bcc03 parent 9528454f9c02fb9c359c4c42c69eed4d47407e39 parent 440c052d6f717495806fe2c65f3f5677c92397c7 author Jeff Garzik Tue, 23 May 2006 17:21:33 -0400 committer Jeff Garzik Tue, 23 May 2006 17:21:33 -0400 Merge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream commit 9528454f9c02fb9c359c4c42c69eed4d47407e39 tree 40e8c7f829b528073d2b216c3b8e6be205c76245 parent 777e1d4a0f3387933f668e7adc81384827975189 parent 1faadface9c5d000bb16e42c89f24859337cf2db author Jeff Garzik Tue, 23 May 2006 17:20:58 -0400 committer Jeff Garzik Tue, 23 May 2006 17:20:58 -0400 Merge branch 'master' into upstream commit 440c052d6f717495806fe2c65f3f5677c92397c7 tree 92e8eed3ddc36ca171b4223de3d11d1be84931f2 parent fdf35d3c49be0ad99e2fd5f5f27c6c0c336a3f11 author Auke Kok Tue, 23 May 2006 13:36:19 -0700 committer Auke Kok Tue, 23 May 2006 13:36:19 -0700 e1000: bump version to 7.0.38-k4 Signed-off-by: Auke Kok commit fdf35d3c49be0ad99e2fd5f5f27c6c0c336a3f11 tree 91983404ceea7b3cb9a30f954a9537fe8fc697fb parent a1943b5a796a11ee516f5c085453d653a87ee8fe author Auke Kok Tue, 23 May 2006 13:36:14 -0700 committer Auke Kok Tue, 23 May 2006 13:36:14 -0700 e1000: remove changelog in driver This honours the request to remove the changelog in the driver code. Signed-off-by: Auke Kok commit a1943b5a796a11ee516f5c085453d653a87ee8fe tree de709f1f48387f06b44f5eb4d82f85c76c48a6ad parent 76c224bc9fdf108ae6e97553322122f53bdbe75c author Auke Kok Tue, 23 May 2006 13:36:10 -0700 committer Auke Kok Tue, 23 May 2006 13:36:10 -0700 e1000: Fix date string in Makefile I forgot to update the date string in the Makefile last time. Signed-off-by: Auke Kok commit 76c224bc9fdf108ae6e97553322122f53bdbe75c tree 3901c34cf3ed64b7cf907917500a5317cf5467a6 parent a42a507cd3af14a2696b7c020996e48c10bf7742 author Auke Kok Tue, 23 May 2006 13:36:06 -0700 committer Auke Kok Tue, 23 May 2006 13:36:06 -0700 e1000: remove leading and trailing whitespace. Some leading and trailing whitespace made it into the driver code here. Signed-off-by: Auke Kok commit a42a507cd3af14a2696b7c020996e48c10bf7742 tree 3e3be1c902ea510d6c84da9c083dccfadfa36c59 parent c653e6351e371b33b29871e5eedf610ffb3be037 author Auke Kok Tue, 23 May 2006 13:36:01 -0700 committer Auke Kok Tue, 23 May 2006 13:36:01 -0700 e1000: remove backslash r debug printfs This removes unwanted characters in the debug output that should have never been there. Signed-off-by: Auke Kok commit c653e6351e371b33b29871e5eedf610ffb3be037 tree 401b966e60317c09c6f2b2d5cd81bfbc0d9e3aeb parent 4e3ceac609cce39cb96e0eb8604934592371ed8c author Auke Kok Tue, 23 May 2006 13:35:57 -0700 committer Auke Kok Tue, 23 May 2006 13:35:57 -0700 e1000: add shutdown handler back to fix WOL Someone was waaay too aggressive and removed e1000's reboot notifier instead of porting it to the new way of the shutdown handler. This change broke wake on lan. Add the shutdown handler back in using the same method as e100 uses. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 777e1d4a0f3387933f668e7adc81384827975189 tree 306580b0d6975cb54a74971aa2f4eb20cec1c8e5 parent 9b8118df486ffec2f42d43dadaceebd0561dd564 author Auke Kok Tue, 23 May 2006 10:35:08 -0700 committer Auke Kok Tue, 23 May 2006 10:35:08 -0700 ixgb: increment version to 1.0.104-k2 Increment the driver version to 1.0.104-k2 Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9b8118df486ffec2f42d43dadaceebd0561dd564 tree c50db295920c2e71b9a3de58029315336b2a2103 parent ec9c3f5d3b8c4dd7340800f02eed87bdf0233e3b author Auke Kok Tue, 23 May 2006 10:35:04 -0700 committer Auke Kok Tue, 23 May 2006 10:35:04 -0700 ixgb: add tx timeout counter This adds a TX timeout counter to the ethtool stats, a tx timeout debug message, and sets the timer to 5 seconds. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit ec9c3f5d3b8c4dd7340800f02eed87bdf0233e3b tree 5397e9b952cf06246b8360bab0e27f91eb329ae4 parent c85fd6f0dedcec411438768bb5ebd133b1ae3347 author Auke Kok Tue, 23 May 2006 10:34:59 -0700 committer Auke Kok Tue, 23 May 2006 10:34:59 -0700 ixgb: use DPRINTK and msglvl, and ethtool to control it Use DPRINTK and msglvl, and ethtool to control it. Add proper names to netdev structs and mappings. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit c85fd6f0dedcec411438768bb5ebd133b1ae3347 tree 868cde6c975b2505658faedf24f99a637f41bd1b parent 940829e2f9d89d3caddc852bca9018cf503ea719 author Auke Kok Tue, 23 May 2006 10:30:02 -0700 committer Auke Kok Tue, 23 May 2006 10:30:02 -0700 ixgb: remove hardcoded number This adds a define for an awkward and uncommented value. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 940829e2f9d89d3caddc852bca9018cf503ea719 tree aae6a6f8c3bcc80a54fae135634958e2f4b6c6cb parent f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 author Auke Kok Tue, 23 May 2006 10:29:58 -0700 committer Auke Kok Tue, 23 May 2006 10:29:58 -0700 ixgb: add copper 10gig driver id Add support for Copper 10GbE device ID 109E Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 tree f4afafd176b7b8a1635e58dfa2f24f859dce9ed4 parent 953784d66d8f621a8684d007e526ca26b12d54a1 author Auke Kok Tue, 23 May 2006 10:29:53 -0700 committer Auke Kok Tue, 23 May 2006 10:29:53 -0700 ixgb: add NETIF_F_LLTX analogous to e1000 add NETIF_F_LLTX code like e1000 has Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 953784d66d8f621a8684d007e526ca26b12d54a1 tree 2bc2564e76b842e37d2a7d87e001fba6c38ecb4f parent 4de17c8c7295d32d4e112e214aa90d8f7006972f author Auke Kok Tue, 23 May 2006 10:29:50 -0700 committer Auke Kok Tue, 23 May 2006 10:29:50 -0700 ixgb: fix flow control Make default flow control only have *sending* of flow control packets enabled, and fix to disable / enable flow control correctly. Set flow control defaults to disable receiving flow control from the link partner, to fix the transmit fifo overlow errata Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 4de17c8c7295d32d4e112e214aa90d8f7006972f tree a484ef4d60c9efc274dcfbcae573aecc16e53fa5 parent 96f9c2e277768099479fbed7c3b69c294b1fadef author Auke Kok Tue, 23 May 2006 10:29:46 -0700 committer Auke Kok Tue, 23 May 2006 10:29:46 -0700 ixgb: remove duplicate code setting duplex and speed Removed duplicate code. Create ixgb_set_speed_duplex function to contain duplicate code. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 96f9c2e277768099479fbed7c3b69c294b1fadef tree 468b06ab34bb6184e6561c1849dbffef06ffc7eb parent 4e3ceac609cce39cb96e0eb8604934592371ed8c author Auke Kok Tue, 23 May 2006 10:29:41 -0700 committer Auke Kok Tue, 23 May 2006 10:29:41 -0700 ixgb: fix rare early tso completion Fix rare early completion when using TSO. This essentially is the e1000 fix, with code that was mostly already written. Another skb frag was also needed. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit df8ccb9bf1ca360581a94c2245efb9fa613fbb29 tree 7b8649190804451fe8e13316d5aaa949afb513b6 parent 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 author Marcin Juszkiewicz Mon, 22 May 2006 10:56:55 +0200 committer John W. Linville Mon, 22 May 2006 14:51:33 -0400 [PATCH] hostap: new pcmcia IDs Add two Prism cards to hostap_cs driver. product info: "Pretec", "CompactWLAN Card 802.11b", "2.5" manfid: 0x0156, 0x0002 product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", "" manfid: 0x0156, 0x0002 Signed-off-by: Marcin Juszkiewicz Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 tree 625280bf6eae0141fe91844334168d51d7d89fca parent 3b38f317e529d8396377dafc7d95a1451a151df5 parent 82464e63a0653a4d8e5c684fcb41b163e6357c6d author John W. Linville Mon, 22 May 2006 14:45:29 -0400 committer John W. Linville Mon, 22 May 2006 14:45:29 -0400 Merge branch 'upstream-fixes' into upstream commit 82464e63a0653a4d8e5c684fcb41b163e6357c6d tree 6e6862df039c1118caecc5c669a53ffded38381e parent 353b28bafd1b962359a866ff263a7fad833d29a1 author Florin Malita Sun, 21 May 2006 14:04:44 -0700 committer John W. Linville Mon, 22 May 2006 14:39:04 -0400 [PATCH] orinoco: possible null pointer dereference in orinoco_rx_monitor() If the skb allocation fails, the current error path calls dev_kfree_skb_irq() with a NULL argument. Also, 'err' is not being used. Coverity CID: 275. Signed-off-by: Florin Malita Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 3b38f317e529d8396377dafc7d95a1451a151df5 tree 65e80799417c456bdd907b7d80182732be02e5f4 parent 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 parent 353b28bafd1b962359a866ff263a7fad833d29a1 author John W. Linville Mon, 22 May 2006 14:26:25 -0400 committer John W. Linville Mon, 22 May 2006 14:26:25 -0400 Merge branch 'from-linus' into upstream commit 4e3ceac609cce39cb96e0eb8604934592371ed8c tree 019b674bf79489128b4f1985ea99c5deca2cb15b parent badc48e6605ddeeb2484afae5993c859494decaa parent bb02aacc02c6002143a1cfc313d144a413eec8d0 author Jeff Garzik Sat, 20 May 2006 00:26:26 -0400 committer Jeff Garzik Sat, 20 May 2006 00:26:26 -0400 Merge branch 'upstream-fixes' into upstream commit badc48e6605ddeeb2484afae5993c859494decaa tree 7da638f9bb53b1812b71e40ad6deca91d59ad301 parent 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a parent 2f880b65fdbc2d4915bddc59d75a176329570fdd author Jeff Garzik Sat, 20 May 2006 00:03:38 -0400 committer Jeff Garzik Sat, 20 May 2006 00:03:38 -0400 Merge branch 'master' into upstream commit 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 tree dfae1dfe50155f0ab85d057acf1b94cf7072eafe parent 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f author Arjan van de Ven Tue, 02 May 2006 18:01:41 +0200 committer John W. Linville Wed, 17 May 2006 14:58:55 -0400 [PATCH] unused exports in wireless drivers There's a bunch of unused exports in the wireless drivers; that's bad since unused exports take up quite a bit of space in total; the patch below removes them. Signed-off-by: Arjan van de Ven Signed-off-by: John W. Linville commit 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f tree fb9b7de045e39313509c370dfa1c0ffa827f41be parent 5dd8816aeb1f068ade0349a22009ff7a66f25413 parent bc519f30eb039f023c15167663d5a8a14fed7dcb author John W. Linville Wed, 17 May 2006 14:54:09 -0400 committer John W. Linville Wed, 17 May 2006 14:54:09 -0400 Merge branch 'upstream-fixes' into upstream commit 5dd8816aeb1f068ade0349a22009ff7a66f25413 tree c56ff327b1dfa8868b4208aea9ac4158e3bfe308 parent f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc parent 0c056c50a6218e0e577817c16ba8851af593d742 author John W. Linville Wed, 17 May 2006 14:51:24 -0400 committer John W. Linville Wed, 17 May 2006 14:51:24 -0400 Merge branch 'from-linus' into upstream commit f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc tree 461bccf4b2ff9ad57a19800f02670be818a9c0b2 parent ec000ca9d4b23dfb67b70bdf72950e76728c74d9 author Stefano Brivio Fri, 05 May 2006 03:02:25 +0200 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] bcm43xx: add PCI ID for bcm4319 Add PCI ID for bcm4319. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit ec000ca9d4b23dfb67b70bdf72950e76728c74d9 tree e8d062818ce0f4293c3a37850f51ed96a2bd455e parent 8462fe3cd9ec8951871a20a4dfe36321ab075964 author Stefano Brivio Fri, 05 May 2006 02:58:29 +0200 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] bcm43xx: fix whitespace Fix whitespace. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 8462fe3cd9ec8951871a20a4dfe36321ab075964 tree 8b3c6db6091ee99b4791a911734229181ef6f473 parent 461c078c9cdfc1d24a436a87daed90f18c3b0d0d author Daniel Drake Mon, 01 May 2006 22:45:50 +0100 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] softmac: suggest per-frame-type TX rate This patch is the first step towards rate control inside softmac. The txrates substructure has been extended to provide different fields for different types of packets (management/data, unicast/multicast). These fields are updated on association to values compatible with the access point we are associating to. Drivers can then use the new ieee80211softmac_suggest_txrate() function call when deciding which rate to transmit each frame at. This is immensely useful for ZD1211, and bcm can use it too. The user can still specify a rate through iwconfig, which is matched for all transmissions (assuming the rate they have specified is in the rate set required by the AP). At a later date, we can incorporate automatic rate management into the ieee80211softmac_recalc_txrates() function. This patch also removes the mcast_fallback field. Sam Leffler pointed out that this field is meaningless, because no driver will ever be retransmitting mcast frames (they are not acked). Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 461c078c9cdfc1d24a436a87daed90f18c3b0d0d tree 90b08022254282c74cba106e0d94431ad31dc598 parent 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e author Pavel Roskin Mon, 01 May 2006 02:13:33 -0400 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] orinoco: don't put PCI resource data to the network device The resource data in the network device is intended for ISA and other older busses, but not for PCI. Don't put PCI data there. Don't (ab)use the network device for keeping the IRQ number. Retire orinoco_pci_setup_netdev(), and print some minimal information to the kernel log instead, identifying the network device and the driver mostly to identify problems at startup. Scripts should rely on sysfs. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e tree 7def22b19bd1e844df935c0d2ec3929adc76930d parent 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0 author Pavel Roskin Mon, 01 May 2006 02:13:30 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: eliminate the suspend/resume functions if CONFIG_PM is unset Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0 tree da9de71c1eef54be38880ef5ddc63e5622cae516 parent 9a568da2097ad3701ca575cb6d360d56ffeee446 author Pavel Roskin Mon, 01 May 2006 02:13:28 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: simplify locking, fix error handling in PCMCIA resume Don't use flags in the spinlocks - the PCMCIA resume functions may not be called under lock. Don't ignore any errors. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 9a568da2097ad3701ca575cb6d360d56ffeee446 tree 063cf2e349753d83d6306baf06ccf0d84a4c7abb parent e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 author Pavel Roskin Mon, 01 May 2006 02:13:26 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: report more relevant data on startup Report only the first I/O window and IRQ, and also add the driver name. The second I/O window, Vpp and configuration index are not interesting to most users. They can be found by PCMCIA debug tools if needed. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 tree 1ba191d656aaf340bf35788e2f90ad613b9e384e parent 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf author Pavel Roskin Mon, 01 May 2006 02:13:24 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: unregister network device before releasing PCMCIA resources Hardware resources should not be made available to other devices while the network device is still registered. Also remove the related debug statements. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf tree aa91c45eb089e087d74903e5483487b97cbd863c parent 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee author Adrian Bunk Thu, 27 Apr 2006 02:33:42 -0700 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] ieee80211_wx.c: remove dead code Since sec->key_sizes[] is an u8, len can't be < 0. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee tree 7d82f1380f10ac3b4f042f4953c65e5e284e5acf parent 0c6157a371f72b91bd9d2f72c2e65e2bde4cdf39 author Daniel Drake Mon, 01 May 2006 22:23:27 +0100 committer John W. Linville Fri, 05 May 2006 17:10:39 -0400 [PATCH] softmac: deauthentication implies deassociation The 802.11 specs state that deauthenticating also implies disassociating. This patch implements that, which improve the behaviour of SIOCSIWMLME. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 0c6157a371f72b91bd9d2f72c2e65e2bde4cdf39 tree 0db5ac2e35e29738a17a1f7bbe3a19c5f1b85a84 parent fd5226a72694d1c0abe1cc39711a86f1754e637d author Michal Schmidt Tue, 02 May 2006 23:29:55 +0200 committer John W. Linville Fri, 05 May 2006 17:10:39 -0400 [PATCH] wireless/airo: minimal WPA awareness Running Linux 2.6.17-rc3-mm1 which has this patch included I get this interesting message: airo(eth0): WPA unsupported (only firmware versions 5.30.17 and greater support WPA. Detected 5.30.17) airo_test_wpa_capable assumes that the softSubVer part of the firmware version number is coded in BCD. Apparently, that's not true. I have firmware version 5.30.17 and cap_rid.softSubVer is 0x11==17. Signed-off-by: Michal Schmidt Signed-off-by: John W. Linville commit fd5226a72694d1c0abe1cc39711a86f1754e637d tree 1d90b27c392fb2ef9859f2652dee7640916ed806 parent aad61439e6a00bdb72cb649e11f6e166590c5f66 parent 178e0cc5ff249965c6cfbd78b1af6a5e614d837c author John W. Linville Fri, 05 May 2006 16:56:24 -0400 committer John W. Linville Fri, 05 May 2006 16:56:24 -0400 Merge branch 'upstream-fixes' into upstream commit aad61439e6a00bdb72cb649e11f6e166590c5f66 tree 2279f3c2a15f81526d14182c6acb358cafd0b359 parent 3c304956755fa63ee80ca51ce38078fe1c4e8818 parent d98550e334715b2d9e45f8f0f4e1608720108640 author John W. Linville Fri, 05 May 2006 16:50:23 -0400 committer John W. Linville Fri, 05 May 2006 16:50:23 -0400 Merge branch 'from-linus' into upstream commit 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a tree b55e9d7a5d4ef746f38a10614bf01c2ab2dacd42 parent 5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956 parent ebf34c9b6fcd22338ef764b039b3ac55ed0e297b author Jeff Garzik Tue, 02 May 2006 15:26:21 -0400 committer Jeff Garzik Tue, 02 May 2006 15:26:21 -0400 Merge branch 'upstream-fixes' into upstream commit 5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956 tree 94c34884194215e427538a6bc14c239ad8b5c09c parent bd1034f035f3679fbc753a1368559c0b4b89f8f6 author Ananda Raju Fri, 21 Apr 2006 19:23:26 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: init/shutdown fixes Hi, The following patch contains fix related to init and shutdown of adapter as per user guide. The list of changes include 1. shutdown gracefully. 2. Need to mask/unmask interrupts in ISR required fro Xframe-E 3. Tx FIFO should be enabled after WRR calender programming Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit bd1034f035f3679fbc753a1368559c0b4b89f8f6 tree b4c51f217c4067a0dfbebe20cc5a19dc7817cd3c parent c92ca04b2a21852fbc6842e8a7c6fff3ae255b30 author Ananda Raju Fri, 21 Apr 2006 19:20:22 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: additional stats Hi, This patch contains additional statistics counters added to s2io driver these statistics are very much usefull in debugging the driver. Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit c92ca04b2a21852fbc6842e8a7c6fff3ae255b30 tree 9c161719d811a693d1ee3b202494e5a6d446c42e parent 9dc737a77353920a67337aa627f7d9dae8dade05 author Ananda Raju Fri, 21 Apr 2006 19:18:03 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: fixes Hi, This patch contains some of the bug fixes done for S2io driver. Following are the brief description of changes 1. Continuing with initialization if we get minimum required MSI-X vectors 2. fix for ethtool online link test fails 3. make wait_for_cmd_complete generic for all command status registers 4. Print "Device is on PCI-E bus" for Xframe-E card 5. CX4 requires additional delay after sw_reset, and requires higher value for igp 6. Fixed panic due to non-TCP and/or LLC/SNAP traffic in case of lro 7. remove legacy code for old transponder 8. SPECIAL_REG_WRITE made to use 32-bit writes irrespective of system type 9. handle link interrupt as per user guide for Xframe II 10. Wait till all interrupts hndled Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 9dc737a77353920a67337aa627f7d9dae8dade05 tree b87c69eb07c905791c68b7b976b72b31712ac621 parent 863c11a91e4507c3ff44783a75a5433c8cf7700e author Ananda Raju Fri, 21 Apr 2006 19:05:41 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: input parms, output messages update hi, This patch contains the modification and bug fixes with respect to input parameters and outupt dmesages. following is brief description of the changes. 1. Set default values for rx_ring_sz[0..7] and tx_fifo_len[0..7] 2. verify few basic load parameters 3. read product description from VPD 4. clean up of dmesg when driver is loaded Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 863c11a91e4507c3ff44783a75a5433c8cf7700e tree f1a3e065ed6787c693b8b56418c571dc950bdb88 parent 1fb5fef9b80d9a3b5368e22031627afd1585487b author Ananda Raju Fri, 21 Apr 2006 19:03:13 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:35 -0400 [PATCH] s2io: performance improvements hi, This patch contains all the changes that were done to improve performance of s2io driver. one line description of the changes are 1. For Non NAPI case the rx interrupt handler is being called unconditionally 2. code optimization and adding prefetch skb->data 3. Remove modulo operations in fast path 4. Enable Group Reads and set backoff interval to 0x1000 5. correct PIC_CNTL_SHARED_SPLITS macro definition, and reduce pause parameter 6. Corrected logic of identifying rx buffer level in rx_buffer_level() 7. fix DMA map and unmap done with different sizes in 1-buf mode 8. Removed forcible disabling of ERO 9. Send up the packets with transfer code = 0x5 Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 1fb5fef9b80d9a3b5368e22031627afd1585487b tree 54f07a532b5b2622b8642156bbcaeca637fcdb8f parent 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e parent 330ab71619bacc4d4494227a6cfc9b7f5500403d author Jeff Garzik Tue, 02 May 2006 14:33:57 -0400 committer Jeff Garzik Tue, 02 May 2006 14:33:57 -0400 Merge branch 'master' into upstream commit 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e tree e0e70aa880b8c8f2c1a979438a523241f6193742 parent 9f1da23b631f92393f58f664348ffc5faeaddeb3 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jeff Garzik Thu, 27 Apr 2006 04:52:44 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:52:44 -0400 Merge branch 'master' into upstream commit 9f1da23b631f92393f58f664348ffc5faeaddeb3 tree 68c7bf9c0f4b11117cf6b3cde5fa5c4f2929088a parent 00355cd938bac2a6006efa140352958784431f1f parent 86a0f04387bfa814618bf0c2c8b203899c4fa5d2 author Jeff Garzik Wed, 26 Apr 2006 06:21:31 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:21:31 -0400 Merge branch 'upstream-fixes' into upstream commit 00355cd938bac2a6006efa140352958784431f1f tree 4f8bd8f9117a5ea180da97fd889b5305738b3be2 parent 45de6fd958d7f407bdb5fdc6914b3262519d891c parent 3c304956755fa63ee80ca51ce38078fe1c4e8818 author Jeff Garzik Wed, 26 Apr 2006 06:18:15 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:18:15 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 45de6fd958d7f407bdb5fdc6914b3262519d891c tree c1b9f9023e93d0f28f773ca4be41d107f79cd600 parent 1f5d5dbf0372dd933d8325054889ba09d996e50b parent 3b908870b8332dfd40be0e919e187aa4991536fb author Jeff Garzik Wed, 26 Apr 2006 06:18:00 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:18:00 -0400 Merge branch 'upstream-fixes' into upstream commit 3c304956755fa63ee80ca51ce38078fe1c4e8818 tree 4225b87cdf197139e47f931b28fa897dc21f56d5 parent 921a91ef6adffe066ce80823350b982c647033e7 author Dan Williams Sat, 15 Apr 2006 12:26:18 -0400 committer John W. Linville Mon, 24 Apr 2006 16:26:14 -0400 [PATCH] wireless/airo: minimal WPA awareness airo cards with firmware versions of 5.30.17 and higher support WPA. This patch recognizes WPA-capable firmware versions and adds support for retrieving the WPA and RSN information elements from the card's scan results. The JOB and FLAG fields are now independent, since there was no space left in the FLAG field for FLAG_WPA_CAPABLE. Signed-off-by: matthieu castet Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 921a91ef6adffe066ce80823350b982c647033e7 tree b950c18419413d860a8caa7ac0819d0159beed79 parent 9a1771e86756212041b32d80b850cc4c8063360a author Johannes Berg Thu, 20 Apr 2006 20:02:04 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:58 -0400 [PATCH] softmac: clean up event handling code This patch cleans up the event handling code in ieee80211softmac_event.c and makes the module slightly smaller by removing some strings that are not used any more and consolidating some code. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9a1771e86756212041b32d80b850cc4c8063360a tree 798f75306930072d8d97f95ef1a6846a27f003f5 parent e3c5a64e7075dd066316f1685caadabcbc649427 author Johannes Berg Thu, 20 Apr 2006 20:02:02 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:58 -0400 [PATCH] softmac: add SIOCSIWMLME This patch adds the SIOCSIWMLME wext to softmac, this functionality appears to be used by wpa_supplicant and is softmac-specific. Signed-off-by: Johannes Berg Cc: Jouni Malinen Signed-off-by: John W. Linville commit e3c5a64e7075dd066316f1685caadabcbc649427 tree b7ebbc4e7867755f2f30df73523f55f4655788be parent 127119d50ff6e226c602ae920722897f8a0c81e2 author Zhu Yi Thu, 13 Apr 2006 17:21:13 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: Fix wpa_supplicant association problem The new ipw2200 scan completion event feature will cause a potential event race condition in wpa_supplicant. The patch fixes this problem by move the ipw_disassociate() to the IW_AUTH_WPA_ENABLED event handling code. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 127119d50ff6e226c602ae920722897f8a0c81e2 tree c750aeb5340e3bfae329876b85bef5b0555848ef parent 459d408768fecfd1c2d170ab073e8cfd48326b1f author Zhu Yi Thu, 13 Apr 2006 17:21:06 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: remove priv->last_noise reference priv->last_noise is not used with the exponential averaging algorithm Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 459d408768fecfd1c2d170ab073e8cfd48326b1f tree e7eb822be216be303e7a1bff4882696e387da1ac parent 34f8ae467b066ab4cf90bdf85efd10e7d43f2ff0 author Zhu Yi Thu, 13 Apr 2006 17:21:00 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: rename CONFIG_IEEE80211_RADIOTAP to CONFIG_IPW2200_RADIOTAP Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 34f8ae467b066ab4cf90bdf85efd10e7d43f2ff0 tree be89041e69e3bceaf9b86503849f17f6b951b330 parent e43e3c1e900ec5b6662cf1901b27975c111289bf author Zhu Yi Thu, 13 Apr 2006 17:20:54 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] wireless Kconfig add IPW2200_RADIOTAP Makefile both IPW2200_RADIOTAP and IPW2200_PROMISCUOUS depend on IPW2200_MONITOR. Let IPW2200_PROMISCUOUS select IPW2200_RADIOTAP. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e43e3c1e900ec5b6662cf1901b27975c111289bf tree 7b926393a0fc33d69693705e26f4d62a02559cb3 parent 555fd91852880f927f131520889e1fe674ed7e7a author Zhu Yi Thu, 13 Apr 2006 17:20:45 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: rename CONFIG_IPW_QOS to CONFIG_IPW2200_QOS Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 555fd91852880f927f131520889e1fe674ed7e7a tree 6a26f6324e2f777adc3135a5f10e6500e2f66fd5 parent ae4af61f6d9909f3c3ab74694c06865f27c9b054 author Zhu Yi Thu, 13 Apr 2006 17:20:40 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: update version stamp to 1.1.2 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ae4af61f6d9909f3c3ab74694c06865f27c9b054 tree 10ff60e450e43389484a99cceeffd3578a89d3af parent d685b8c226727bf5db907c7241f55461e7f1f008 author Zhu Yi Thu, 13 Apr 2006 17:20:34 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: version string rework Added version string fields so the version string indicates what is configured (ie, you'll see 1.1.1kpmd if you are using a GIT snapshot (Kernel.. previously -git), promiscuous (p), monitor (m), debug (d) build. Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d685b8c226727bf5db907c7241f55461e7f1f008 tree 698e2194daef4c065ccbfd22802e7214caf6ea93 parent c6c33a779dfe7aa8254be4da08c217914f1390a0 author Zhu Yi Thu, 13 Apr 2006 17:20:27 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: Enable rtap interface for RF promiscuous mode while associated With this patch, a new promiscuous mode is enabled. If the module is loaded with the rtap_iface=1 module parameter, two interfaces will be created (instead of just one). The second interface is prefixed 'rtap' and provides received 802.11 frames on the current channel to user space in a radiotap header format. Example usage: % modprobe ipw2200 rtap_iface=1 % iwconfig eth1 essid MyNetwork % dhcpcd eth1 % tcpdump -i rtap0 If you do not specify 'rtap_iface=1' then the rtap interface will not be created and you will need to turn it on via: % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface You can filter out what type of information is passed to user space via the rtap_filter sysfs entry. Currently you can tell the driver to transmit just the headers (which will provide the RADIOTAP and IEEE 802.11 header but not the payload), to filter based on frame control type (Management, Control, or Data), and whether to report transmitted frames, received frames, or both. The transmit frame reporting is based on a patch by Stefan Rompf. Filters can be get and set via a sysfs interface. For example, set the filter to only send headers (0x7), don't report Tx'd frames (0x10), and don't report data frames (0x100): % echo 0x117 > /sys/bus/pci/drivers/ipw2200/*/rtap_filter All your packets are belong to us: % tethereal -n -i rtap0 Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c6c33a779dfe7aa8254be4da08c217914f1390a0 tree cca4c65451d90489d458a14501c26f2155723784 parent 0070f8c738f757c2dda521d6bc310dc2dfdbf643 author Zhu Yi Thu, 13 Apr 2006 17:20:21 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] README.ipw2200: rename CONFIG_IPW_DEBUG to CONFIG_IPW2200_DEBUG Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 0070f8c738f757c2dda521d6bc310dc2dfdbf643 tree 229a423cc8ec6f11d9f7094546350eef76928376 parent 455936c73337c1c9abeac8c4da1c109a0250ab68 author Zhu Yi Thu, 13 Apr 2006 17:20:12 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: Fix endian issues with v3.0 fw image format This patch corrects endian issues with the v3.0 fw image format. Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 455936c73337c1c9abeac8c4da1c109a0250ab68 tree e2f5c6bfa7aa58387fa3544c7d1705b6363d58b2 parent 61fb9ed99dc8876cb118bd9ab46b535ca8c820e8 author Zhu Yi Thu, 13 Apr 2006 17:20:05 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: Set the 'fixed' flags in wext get_rate Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 61fb9ed99dc8876cb118bd9ab46b535ca8c820e8 tree 0542c4df6ea30f9fd8b87dc61de7bffc284c5e5f parent d0b526b71569446aaa848cdf4cf3dd8948f0931a author Zhu Yi Thu, 13 Apr 2006 17:19:55 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: turn off signal debug log Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d0b526b71569446aaa848cdf4cf3dd8948f0931a tree a21580d1a8c7b43aeae621935e979751ab7f93d2 parent 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 author Zhu Yi Thu, 13 Apr 2006 17:19:50 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: Do not continue loading the firmware if kmalloc fails Signed-off-by: Ingo Molnar Cc: "Zhu, Yi" Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 tree 741a1e4d1d4cb1e82832e68f25582117ed82e99d parent d2b83e1214a8395ee18e028d4526cffe9d2eb4ad author Zhu Yi Thu, 13 Apr 2006 17:19:44 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d2b83e1214a8395ee18e028d4526cffe9d2eb4ad tree 883bb1cfe11a76e92dfcc6b6dc40a4a3ba5420f7 parent 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 author Zhu Yi Thu, 13 Apr 2006 17:19:36 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: add module_param support for antenna selection Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 tree 99ab4f99a0025155ff3a62410c40ba38aeaf8b91 parent a5cf4fe65144ff2f35de37c7b58e7ab8ffd84d19 author Zhu Yi Thu, 13 Apr 2006 17:19:25 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: generates a scan event after a scan has completed The patch make ipw2200 generate the scan event every time a scan has completed, so that user space know when to get fresh results. Dan Williams would like to go towards this model in Network Manager rather than having to poll. Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit a5cf4fe65144ff2f35de37c7b58e7ab8ffd84d19 tree 405454d2816152c41e0e40d7846c9de18ae927d2 parent 00d21de5c685ab450ef376acdd1b733badb6b50d author Zhu Yi Thu, 13 Apr 2006 17:19:11 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: Fix TX QoS enabled frames problem This patch works with the ieee80211 stack to set the correct QoS bit to the ipw2200 card. It fixed the TX failure problem for using WPA with QoS. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 00d21de5c685ab450ef376acdd1b733badb6b50d tree cafb8af00344d068943666f893a84260eaa84bed parent 45a62ab3d6f9d5963cb7c01fa76c950e42d037c2 author Zhu Yi Thu, 13 Apr 2006 17:19:02 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: Exponential averaging for signal and noise Level This patch replaces sliding averaging by exponential averaging for reporting the wireless statistics for signal and noise level for ipw2200. See details from: http://www.ces.clemson.edu/linux/ipw2200_averages.shtml Signed-off-by: Bill Moss Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 45a62ab3d6f9d5963cb7c01fa76c950e42d037c2 tree 203fb320997e967d47edcc699a2c5facacd3d65d parent 7736b5bd93765fc1db5b3b6e25200d7c4292d14b author Zhu Yi Thu, 13 Apr 2006 17:17:54 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ieee80211: update version stamp to 1.1.13 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 7736b5bd93765fc1db5b3b6e25200d7c4292d14b tree 458d68ad73890f4847ef50831bcae3a2b8e0637e parent 35c14b855f52c49e4f3d078b9532b056005ed321 author Zhu Yi Thu, 13 Apr 2006 17:17:47 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ieee80211: replace debug IEEE80211_WARNING with each own debug macro Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 35c14b855f52c49e4f3d078b9532b056005ed321 tree 4fea40fcc0c6a29038a0c5f3a0927affe20110b3 parent 09593047d8210ca017a0b4aa0a7fb10abf12615f author Zhu Yi Thu, 13 Apr 2006 17:17:35 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: remove unnecessary CONFIG_WIRELESS_EXT checking Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 09593047d8210ca017a0b4aa0a7fb10abf12615f tree cde17a6145434c799dfa6b82427068cefb3953cd parent 73858062b66c07d71bce47a0e4798dd3ce604590 author Zhu Yi Thu, 13 Apr 2006 17:17:26 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: export list of bit rates with standard WEXT procddures The patch replace the way to export the list of bit rates in scan results from IWEVCUSTOM to SIOCGIWRATE. It also removes the max_rate item exported with SIOCGIWRATE since this should be done by userspace. Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 73858062b66c07d71bce47a0e4798dd3ce604590 tree ab97d0268e29c237cbc397bd254ca75c00e9c1be parent ea2841521a7e061b772d6cee03f5b23c58a58284 author Zhu Yi Thu, 13 Apr 2006 17:17:17 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: Fix TX code doesn't enable QoS when using WPA + QoS Fix ieee80211 TX code when using WPA+QOS. TKIP/CCMP will use the TID field of qos_ctl in 802.11 frame header to do encryption. We cannot ignore this field when doing host encryption and add the qos_ctl field later. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ea2841521a7e061b772d6cee03f5b23c58a58284 tree 6333c04cd21360477fa37cd6a4556d92d6067da4 parent cc9357104b19b2b0377713c33d87d78518912c3d author Zhu Yi Thu, 13 Apr 2006 17:17:06 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: Fix TKIP MIC calculation for QoS frames Fix TKIP MIC verification failure when receiving QoS frames from AP. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit cc9357104b19b2b0377713c33d87d78518912c3d tree e53b117c4d01ef0f4d567d6f7e0891f24fc89fb3 parent f298a2ec62e51cc81b85a120d8fa5b9f8f5a94b1 author Michael Buesch Mon, 10 Apr 2006 02:08:33 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] bcm43xx: use pci_iomap() for convenience. This reduces codesize. Signed-off-by: John W. Linville commit f298a2ec62e51cc81b85a120d8fa5b9f8f5a94b1 tree 1f3d2824c3ece2ac94ac45bd8f7c6de4b17ffdab parent dc3437d205dcd1a195ebf795f1c54ceb638337fb author Pavel Roskin Fri, 07 Apr 2006 04:11:02 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: bump version to 0.15 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit dc3437d205dcd1a195ebf795f1c54ceb638337fb tree 0537c6ad05795a090a908d10e418f213817a4ee1 parent b884c872fa1917614b42a39020ffcca7fa9302b1 author Pavel Roskin Fri, 07 Apr 2006 04:11:00 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: further comment cleanup in the PCI drivers Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b884c872fa1917614b42a39020ffcca7fa9302b1 tree 82f5ba67f6b38c96804fb449e018d83fbdce65a1 parent c6fb2e9abef894efc4870e4c1e3aa4365b830a11 author Pavel Roskin Fri, 07 Apr 2006 04:10:57 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: reduce differences between PCI drivers, create orinoco_pci.h Make all Orinoco PCI drivers (orinoco_pci, orinoco_plx, orinoco_tmd and orinoco_nortel) as similar as possible. Use the best implementation of error handling, the best error messages, the best comments. Put common code to orinoco_pci.h. For now, it's suspend and resume functions and function for registering the network device. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit c6fb2e9abef894efc4870e4c1e3aa4365b830a11 tree ab262b6f480665fa6ea5b9bdc2a6d6383b0dc2f2 parent 3d529962217c3fec36f53f270a37e132b9763c65 author Pavel Roskin Fri, 07 Apr 2006 04:10:55 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors Copy PCI suspend/resume functions from orinoco_pci.c. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 3d529962217c3fec36f53f270a37e132b9763c65 tree e327ba184a666f4ad2e706912c4eba1c6a4a0947 parent d62274b374ce41dd3a90820b124d28fec292a5b7 author Pavel Roskin Fri, 07 Apr 2006 04:10:53 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco_pci: use pci_iomap() for resources Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d62274b374ce41dd3a90820b124d28fec292a5b7 tree d8b7973d10c1e4013608301d678029ddb97aac81 parent 37a6c6117db3f10e1923c14dffa089b10600c4b8 author Pavel Roskin Fri, 07 Apr 2006 04:10:51 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco_pci: disable device and free IRQ when suspending Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 37a6c6117db3f10e1923c14dffa089b10600c4b8 tree 88e84f1635b2e24744061fdbac7c1e2b7ead38d9 parent 2c1bd26035491cd0ba7e49be6ed610fc4912fef9 author Pavel Roskin Fri, 07 Apr 2006 04:10:49 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: delay FID allocation after firmware initialization This is needed to identify the card before possible allocation problems, so that the user at least can report the firmware version that fails. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 2c1bd26035491cd0ba7e49be6ed610fc4912fef9 tree a49cb8466cccfd065419d017c4f6aba023d183d6 parent a28dc81dcd9ca9a451bfcab0a2351b0b07146759 author Jiri Benc Fri, 07 Apr 2006 04:10:47 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: fix BAP0 offset error after several days of operation After several days of operation of Netgear MA311 card, the card becomes to seek improperly and needs reset. This patch tries to reset the card when this situation occurs. Mar 9 06:45:16 berkeley kernel: wlan0: Error -5 writing packet to BAP Mar 9 06:45:16 berkeley kernel: hermes @ f992a000: BAP0 offset error: reg=0x4044 id=0x128 offset=0x44 Mar 9 06:45:16 berkeley kernel: wlan0: Error -5 writing packet to BAP Mar 9 06:45:16 berkeley kernel: hermes @ f992a000: BAP0 offset error: reg=0x4044 id=0x128 offset=0x44 (etc.) A more detailed description of the problem can be found at https://bugzilla.novell.com/show_bug.cgi?id=154773 The same problem with different card is reported at http://sourceforge.net/mailarchive/message.php?msg_id=14597046 Signed-off-by: Jiri Benc Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a28dc81dcd9ca9a451bfcab0a2351b0b07146759 tree 6f9e4b754807e3c81c99879dabd13a422a785327 parent 470e2aa6dbdd2c7eb6562ae365a17a627f7070e8 author Pavel Roskin Fri, 07 Apr 2006 04:10:45 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: simplify 802.3 encapsulation code Use skb_pull() to strip the addresses from the original packet. Don't strip protocol bytes. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 470e2aa6dbdd2c7eb6562ae365a17a627f7070e8 tree d6ecbf82b73c6cb1700c635704dacbda8baa4b7c parent 8d5be088263b0d3dbb7e7959b7c403b3d026a5d3 author Pavel Roskin Fri, 07 Apr 2006 04:10:43 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: refactor and clean up Tx error handling The result of orinoco_xmit() can be OK, dropped packet and busy transmitter. Rename labels accordingly. Increment stats->tx_errors in one place. Increment stats->tx_dropped - nobody is doing it for us. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 8d5be088263b0d3dbb7e7959b7c403b3d026a5d3 tree 912fd8275e7f96a22f3c4935ffba86a520e97b63 parent 6b61626290900f12b7f3978f57f329da6811fb59 author Pavel Roskin Fri, 07 Apr 2006 04:10:41 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: don't use any padding for Tx frames hermes_bap_pwrite() supports odd-sized packets now. There is no minimal packet size for 802.11. Also, hermes_bap_pwrite() supports odd-sized packets now. This removes all reasons to pad the Tx data. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6b61626290900f12b7f3978f57f329da6811fb59 tree 2e1d9518d786bbca0e87ffec3f42a6f5794fe384 parent b34b867e944628418d587367276c9a82e03aba8c author Pavel Roskin Fri, 07 Apr 2006 04:10:39 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco replace hermes_write_words() with hermes_write_bytes() The new function can write an odd number of bytes, thus making padding unnecessary. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b34b867e944628418d587367276c9a82e03aba8c tree 5e2222980d25a95ab478cbe42bd8b84244cbfccf parent 30c2d3b48176279b1381b00ae86f3d01147d0915 author Pavel Roskin Fri, 07 Apr 2006 04:10:36 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: orinoco_xmit() should only return valid symbolic constants Don't ever return -errno from orinoco_xmit() - the network layer doesn't expect it. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 30c2d3b48176279b1381b00ae86f3d01147d0915 tree db25219cc9fc44a2e5590b1fb01c2923a20078a3 parent 4ebe2eb0b388445d18dae34849cc6a9e7c55315f author Pavel Roskin Fri, 07 Apr 2006 04:10:34 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: optimize Tx exception handling in orinoco When processing Tx exception, only read data until addr1. Rename hermes_tx_descriptor_802_11 to hermes_txexc_data since it's only used to Tx exceptions. Reuse existing hermes_tx_descriptor structure. Remove fields after addr1 - they are not read from the card. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 4ebe2eb0b388445d18dae34849cc6a9e7c55315f tree d16c3c0eac315cb62518483f8d78e61c01deb7f5 parent 754b1364e78db796bb3a541f6ea8dec2821c745a author Pavel Roskin Fri, 07 Apr 2006 04:10:32 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: Symbol card supported by spectrum_cs is LA4137, not LA4100 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 754b1364e78db796bb3a541f6ea8dec2821c745a tree 4a522edc2293f202a53ef4ad3220d39b32a45e05 parent 65b1fe7df71e7ad09e9203b6c3875781c30557e0 author Pavel Roskin Fri, 07 Apr 2006 04:10:30 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: remove debug buffer code and userspace include support Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 65b1fe7df71e7ad09e9203b6c3875781c30557e0 tree cfec3c86e899d6148a75b7f21782374e3b9c044f parent 7eeae2ffadf170f954205733f511ca40df91f0b7 author Pavel Roskin Fri, 07 Apr 2006 04:10:28 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove tracing code, it's unused Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 7eeae2ffadf170f954205733f511ca40df91f0b7 tree 82b76648d108291dc15c4cd664b5392cd80da092 parent b018779cbda646c37346433167145b4624c8979b author Pavel Roskin Fri, 07 Apr 2006 04:10:24 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove underscores from little-endian field names Sparse is much better at finding endianess issues than such visual cues. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b018779cbda646c37346433167145b4624c8979b tree de052210e58a6e694192e20eafb543ca6f9fd231 parent a6e26e8ddbe8717103556ecd8ecd383de32671e4 author Pavel Roskin Fri, 07 Apr 2006 04:10:21 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove PCMCIA audio support, it's useless for wireless cards Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a6e26e8ddbe8717103556ecd8ecd383de32671e4 tree 3a6d4954784e68cd97871b33d76e28849abf294b parent 7c241d37fe0e6442c5cf3b5d73f7f58f2dc66352 author Pavel Roskin Fri, 07 Apr 2006 04:10:19 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: Remove useless CIS validation The PCMCIA drivers would never be loaded if the CIS were wrong. No other PCMCIA drivers validate CIS. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 1f5d5dbf0372dd933d8325054889ba09d996e50b tree 16bffeb01b538b70e309dd248b198f30530fa8ad parent a7bb131899814fc2bb7a3226fa8384685fe34f7d parent fef6108d4556917c45cd9ba397c1c7597f3990e1 author Jeff Garzik Thu, 20 Apr 2006 17:55:24 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:55:24 -0400 Merge branch 'upstream-fixes' commit a7bb131899814fc2bb7a3226fa8384685fe34f7d tree 416fe931bfef0599615d7568b30244668315fa65 parent 18e37f2a979dd696e6b4495b6f2470c01ffeab6c parent f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 author Jeff Garzik Thu, 20 Apr 2006 17:42:15 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:42:15 -0400 Merge branch 'upstream-fixes' commit 18e37f2a979dd696e6b4495b6f2470c01ffeab6c tree c1e5b5fe2db54c7596d8db10935ce8d2886a4db1 parent d5498bef6fcd8ca0e4579eeb0b0d724f20221bb1 author Marc Zyngier Thu, 13 Apr 2006 11:38:20 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:42:05 -0400 [PATCH] netdrvr: Convert cassini to pci_iomap Folks, This patch (against 2.6.17-rc1) converts the cassini driver to the pci_iomap API that will do the right thing, so architectures like PARISC can stop screaming about illegal usage of ioremap() on non-cacheable regions. Tested on 64bit PARISC kernel. Signed-off-by: Marc Zyngier Signed-off-by: Jeff Garzik commit d5498bef6fcd8ca0e4579eeb0b0d724f20221bb1 tree c95370d6526d60886731924cf2d467701006df13 parent 0a0c72c9118c4e63080eb409f0cfdf15808d23a4 author Jeff Garzik Thu, 20 Apr 2006 17:39:14 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:39:14 -0400 [netdrvr smc911x] trim trailing whitespace commit 0a0c72c9118c4e63080eb409f0cfdf15808d23a4 tree 99bd8141839f4b26d853626b5eaf532ca8a38bde parent 89be0501a013737d562f56ce1c5a2ff075995b11 author Dustin McIntire Wed, 19 Apr 2006 20:24:51 -0700 committer Jeff Garzik Thu, 20 Apr 2006 17:38:39 -0400 [PATCH] RE: [PATCH 1/1] net driver: Add support for SMSC LAN911x line of ethernet chips > > The patch was badly wordwrapped. Please fix and resend. > OK, I've fixed the wrapping and removed the CONFIG_ARM restriction. I've also did my best to modify the C style to conform to the comments. I noticed that the patch is getting ignored by majordomo due to its size >100K. Should it be broken up somehow to allow posting to the lists? Signed-off-by: Dustin McIntire Signed-off-by: Jeff Garzik commit 89be0501a013737d562f56ce1c5a2ff075995b11 tree 95ab664bcc4949235dce678c72436c673fbf06e9 parent e2fd956c670928e93208dc5d27dfdc7b51163900 author Sergei Shtylyov Wed, 19 Apr 2006 22:46:21 +0400 committer Jeff Garzik Thu, 20 Apr 2006 17:35:26 -0400 [PATCH] au1000_eth.c probe code straightened up Straighten up the AMD Au1xx0 Ethernet probing code, make it print out (and store in the 'net_device' structure) the physical address of the controller, not the KSEG1-based virtual. Make the driver also claim/release the 4-byte MAC enable registers and assign to the Ethernet ports two consecutive MAC addresses to match those that are printed on their stickers. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit e2fd956c670928e93208dc5d27dfdc7b51163900 tree 3ffdee703277984c7383af43de13963654c117e6 parent d1a667892658259aab52d9968571abd9efbc59a1 author Johannes Berg Wed, 19 Apr 2006 15:39:09 +1000 committer Jeff Garzik Thu, 20 Apr 2006 17:32:06 -0400 [PATCH] sungem: Marvell PHY suspend In a short discussion with Benjamin Herrenschmidt he mentioned that Marvell PHYs are powered down the same way as the other ones we currently handle. Thus actually do that, hopefully saving some power during suspend. Signed-off-by: Johannes Berg Acked-by: Benjamin Herrenschmidt Signed-off-by: Jeff Garzik commit d1a667892658259aab52d9968571abd9efbc59a1 tree 470101ab379d375bfd635ecec27ecd59441ac460 parent d269a69fbbbb7ddd2081af7a768feac754b8357a parent 1cb5821f444cadbe94453282f9f4767cf8744a8e author Jeff Garzik Thu, 20 Apr 2006 17:30:41 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:30:41 -0400 Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6 commit d269a69fbbbb7ddd2081af7a768feac754b8357a tree 339e4e580ef66551a3f090bf6f6481755db1b59a parent 5ad05b990062c1b7a797f0ca293f6bdde62a50d9 author Daniele Venzano Mon, 17 Apr 2006 10:28:06 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:29:43 -0400 [PATCH] Add VLAN (802.1q) support to sis900 driver The attached patch adds support for VLANs to the sis900 driver and bumps the version number. It is based on an old (2003) patch for the 2.4 series by Hamid Hashemi Golpayegani. It applies on top of 2.6.16(.5). I have one report that it works and behaves as intended. Please review and consider for inclusion. Signed-off-by: Daniele Venzano -- Signed-off-by: Jeff Garzik commit 5ad05b990062c1b7a797f0ca293f6bdde62a50d9 tree 185775eb5fd444817cb643b5cc01ed1ef16d2212 parent 56347a2e7287377c35c2bac2e8643bf88690425f author Frank Pavlic Thu, 13 Apr 2006 20:19:23 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:27:54 -0400 [PATCH] s390: remove tty support from ctc network device driver [2/2] Hi, here comes the second of the two patches ... Frank From: Peter Tiedemann [2/2]: remove ctctty.c and ctctty.h files . Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 56347a2e7287377c35c2bac2e8643bf88690425f tree e312b0378db979377c96f2395e617c03d1184f43 parent 9707b27100a48950f1e15e08a7c5028786e47f55 author Frank Pavlic Thu, 13 Apr 2006 20:19:12 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:27:54 -0400 [PATCH] s390: remove tty support from ctc network device driver [1/2] Hi jeff, after the first shot I sent to you did not apply I resend two new patches I've made today to remove tty from ctc network driver. Please apply .... Thank you ... Frank From: Peter Tiedemann [1/2]: tty support code will be removed from the ctc network device driver. Today we have a couple of alternatives which are performing much better. The second thing is that ctc should be a network device driver only. We should not mix tty and networking here. This first patch will remove the tty code from ctcmain.c . It also removes the build entry from the Makefile as well as TTY definitions from ctcmain.h. The second patch will remove two files, ctctty.c and ctctty.h. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 9707b27100a48950f1e15e08a7c5028786e47f55 tree 5745b1e7497ae1499a2e2e9e0a567996419ab34f parent 8fc65162a8f25929be80c8d6321a3479e92b5aae parent 402a26f0c040077ed6f941eefac5a6971f0d5f40 author Jeff Garzik Thu, 20 Apr 2006 17:27:45 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:27:45 -0400 Merge branch 'master' commit 1cb5821f444cadbe94453282f9f4767cf8744a8e tree b23e6c848614a7ca67248eaf4e8ec9b50c092075 parent dc86d32ab51c4ad3086472457fb90b61249d91f5 author Auke Kok Tue, 18 Apr 2006 12:31:04 -0700 committer Auke Kok Tue, 18 Apr 2006 12:31:04 -0700 e1000: fix mismerge skb_put. Seems there was a bit of a fix needed to due a bad merge in the legacy receive path. Fixes a panic due to skb_over_panic. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit dc86d32ab51c4ad3086472457fb90b61249d91f5 tree 4f8a266d797110e9f9f76eae04117a756e94f7a2 parent 8fc65162a8f25929be80c8d6321a3479e92b5aae author Auke Kok Tue, 18 Apr 2006 12:30:51 -0700 committer Auke Kok Tue, 18 Apr 2006 12:30:51 -0700 e1000: fix mispatch for media type detect. Recent patch was mismerged in the miitool path. e1000_media_type_copper was being compared with the phy type instead of the media type. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 8fc65162a8f25929be80c8d6321a3479e92b5aae tree cfad5c32408bbdc59a43db16c88f2bea7face7a5 parent 2acab771b7e676125cb8c96b61dcdefe9ba67e57 parent 99a1f9e88694b406b7c334153bacb56adfcf8388 author Jeff Garzik Fri, 14 Apr 2006 23:19:41 -0400 committer Jeff Garzik Fri, 14 Apr 2006 23:19:41 -0400 Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6 commit 99a1f9e88694b406b7c334153bacb56adfcf8388 tree 01f2b3e0dc17f202ce91ebe6dcc0424e9eb9690d parent 3d41e30aa3dde76c81ecbbf0e3a25392fcd90469 author Auke Kok Fri, 14 Apr 2006 19:05:38 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:38 -0700 {e100{,0},ixgb}: Add Auke Kok as new patch maintainer for e{100,1000} and ixgb This adds Auke Kok to the list of maintainers for the Intel NICs. Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3d41e30aa3dde76c81ecbbf0e3a25392fcd90469 tree c8dc188cd9f9016a0359e7fc6d2521f614c41641 parent 77b2aad5b4fcb6e050b64bbda158ce528f933023 author Auke Kok Fri, 14 Apr 2006 19:05:31 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:31 -0700 e1000: Version bump, contact fix, year string change Add the sourceforge project mailinglist to the contact information. Bump version to 7.0.38-k2 Update copyright string with the new year. Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 77b2aad5b4fcb6e050b64bbda158ce528f933023 tree 7d60229345056e9c4e4fe39e79801376bb61dc69 parent 9e2feace1acd38d7a3b1275f7f9f8a397d09040e author Auke Kok Fri, 14 Apr 2006 19:05:25 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:25 -0700 e1000: implement more efficient tx queue locking Implement more efficient locking (avoid the lock) when checking for a stopped queue. Also don't wake the queue unless the threshold is reached to avoid queue on/off thrash. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9e2feace1acd38d7a3b1275f7f9f8a397d09040e tree 109e9bae993df91e2ff83ce7b4fccba9498d0273 parent 6fc7a7eca70780dc1539ce68a6513f9b11891f3c author Auke Kok Fri, 14 Apr 2006 19:05:18 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:18 -0700 e1000: Buffer optimizations for small MTU Remove multi-descriptor support from legacy recieve path Add memory usage efficiency by using more correct size descriptors for small MTU sizes and optimize using LPE for <= 1522 byte frame sizes An extra performance fix that effected our TCP window size growth as a receiver. Set our initial buffer to be 128 bytes instead of 256 to prevent over-socket charge when truesize is computed in the stack. old way: truesize = 256 + l1 = 256 + 1460 = 1716 new way: truesize = 128 + l1 = 128 + 1460 = 1588 The magic value that we can't cross is 1648. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 6fc7a7eca70780dc1539ce68a6513f9b11891f3c tree 474efb015129d75368637ee28aecbb3262da8680 parent 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 author Auke Kok Fri, 14 Apr 2006 19:05:12 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:12 -0700 e1000: Dead variable cleanup Removal of unused rx_dropped counter. Removed reference to E1000_CTRL_EXT_CANC which is no longer valid, replaced with E1000_CTRL_EXT_INT_TIMER_CLR Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 tree c6748fb719c9da8dc7124b7cccccf6cf31394000 parent fe7fe28ea581e090d2908a0d78a2611ae6d43e2c author Auke Kok Fri, 14 Apr 2006 19:05:06 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:06 -0700 e1000: Update truesize with the length of the packet for packet split Update skb with the real packet size. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit fe7fe28ea581e090d2908a0d78a2611ae6d43e2c tree 20ffef790a0ca0f0e8463df68d0628bffdccefe9 parent e619d52349ab8c0044859c28ab05e4c7a410fe14 author Auke Kok Fri, 14 Apr 2006 19:04:59 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:59 -0700 e1000: Made an adapter struct variable into a local (txb2b) Made an adapter struct variable into a local (txb2b) Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e619d52349ab8c0044859c28ab05e4c7a410fe14 tree 74c09a1acbe54f569a1bc0c4eca05211ff9dab5f parent 4cc15f54991caf1572e03ffc65d9986e433007e2 author Auke Kok Fri, 14 Apr 2006 19:04:52 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:52 -0700 e1000: De-inline functions to benefit from compiler smartness De-inline functions to benefit from compiler smartness Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 4cc15f54991caf1572e03ffc65d9986e433007e2 tree cc32bb4993833593f3c46ead3a5572ba8920fdb6 parent d0e027db7861ef03de0ac08494a9a61984d8f8b0 author Auke Kok Fri, 14 Apr 2006 19:04:46 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:46 -0700 e1000: Esb2 wol link cycle bug and uninitialized registers Esb2 link didn't return after wol disable. The code previously assumed that writing reset to PHY_CTRL phy register turned the phy back on. In the ESB2 phy case that didn't occur. Add ESB2 to acquire/release_hw functions upon review it was discovered that esb2 was skipped on these functions Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit d0e027db7861ef03de0ac08494a9a61984d8f8b0 tree d1102d2ef0867b972a0737b70e5f0643c44788df parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Auke Kok Fri, 14 Apr 2006 19:04:40 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:40 -0700 e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels remove DPRINTKs that were printing warnings about power management on 2.4 kernels. Since we really don't react differently these printk statements are not needed. This code was originally added to fix some compile time warnings that got fixed by newer kernels. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 2acab771b7e676125cb8c96b61dcdefe9ba67e57 tree 86227af3c9ad0d90823e5488a86f7f453ed1837a parent 201e06279823c73242de987f192f43d2b30e5331 parent 64541d19702cfdb7ea946fdc20faee849f6874b1 author Jeff Garzik Fri, 14 Apr 2006 20:48:55 -0400 committer Jeff Garzik Fri, 14 Apr 2006 20:48:55 -0400 Merge branch 'master' commit 201e06279823c73242de987f192f43d2b30e5331 tree 409cbf8533ae3242a036c8c013bcd43d9c1410b3 parent 32ea89ecb25789b1b7db28146558587a42f3b372 parent c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 author Jeff Garzik Wed, 12 Apr 2006 18:11:33 -0400 committer Jeff Garzik Wed, 12 Apr 2006 18:11:33 -0400 Merge branch 'upstream-fixes' commit 32ea89ecb25789b1b7db28146558587a42f3b372 tree c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 parent 58a7ce64426394a46e80cdc9440cc1e7c195e85d parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Jeff Garzik Wed, 12 Apr 2006 17:52:52 -0400 committer Jeff Garzik Wed, 12 Apr 2006 17:52:52 -0400 Merge branch 'master' commit 51d797474f87b375819d084f7583a2864c5656c4 tree 03ccc62e0b1b9f62442ef26e373e2a9ad798d5d8 parent 3587c50991b96fee2d26942f380e36e4f40fad71 author Dave Airlie Mon, 03 Apr 2006 16:19:26 +1000 committer Dave Airlie Mon, 03 Apr 2006 16:19:26 +1000 intelfb: some cleanups for intelfbhw Signed-off-by: Dave Airlie commit 3587c50991b96fee2d26942f380e36e4f40fad71 tree 1266f26fa14b96e540a1388968a030edf264894d parent 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e author Dave Airlie Mon, 03 Apr 2006 14:46:55 +1000 committer Dave Airlie Mon, 03 Apr 2006 14:46:55 +1000 intelfb: fixup pitch calculation like X does Signed-off-by: Dave Airlie commit 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e tree f2fe6212fcee1952a81022c33afa9dbc836c2e71 parent 46f60b8e67e6fceede851dc69cdee2d7c0de27b9 author Dave Airlie Fri, 31 Mar 2006 17:08:52 +1000 committer Dave Airlie Mon, 03 Apr 2006 11:43:29 +1000 intelfb: fixup p calculation This fixes up the p calculation of p1 and p2 for the i9xx chipsets. This seems to work a lot better for lower pixel clocks.. Signed-off-by: Dave Airlie commit 46f60b8e67e6fceede851dc69cdee2d7c0de27b9 tree 844bfba5d06f348bdd443cdd471d5d814337d141 parent 9a90603f65dd5046ddcd586158abcad7784892b6 author Dave Airlie Fri, 24 Mar 2006 12:31:14 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:29 +1000 This patch makes a needlessly global struct static. Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie commit 9a90603f65dd5046ddcd586158abcad7784892b6 tree e522d2fbc83a491ed50cee596a4c5d983460c2b4 parent 8b91b0b4f2d731b92f59bc82492769a09b4955a6 author Dave Airlie Thu, 23 Mar 2006 21:53:05 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add i945GM support Untested i945GM support just add the framework. Signed-off-by: Dave Airlie commit 8b91b0b4f2d731b92f59bc82492769a09b4955a6 tree aeb384e59229d4814733195db5836ad9ab448c17 parent 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 author Dave Airlie Thu, 23 Mar 2006 19:23:48 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: fixup whitespace.. repeat after me, I must not take code from X without reformatting... Signed-off-by: Dave Airlie commit 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 tree 558db93f69096ede171d0b4e6c6c0330d8362e92 parent 7679f4d69296de97a7f62458cc4d1c6c884dfcfb author Dave Airlie Thu, 23 Mar 2006 13:06:32 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add hw cursor support for i9xx This adds hw cursor support for the i9xx chipsets. Signed-off-by: Dave Airlie commit 7679f4d69296de97a7f62458cc4d1c6c884dfcfb tree 118ec34ee36be93d95abeb2628a16cd0d386c927 parent 9639d5ec07a490134f05ac890506a367aaf8663b author Dave Airlie Thu, 23 Mar 2006 12:30:05 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: make i915 modeset This takes the modeset and pll code from my X driver. Signed-off-by: Dave Airlie commit 9639d5ec07a490134f05ac890506a367aaf8663b tree 9e921a2fa9de05dadbb75ab1e63d06df1efd6fa6 parent 0c187addabbaf93512902442b4a90140a21b0ddc author Dave Airlie Thu, 23 Mar 2006 11:23:55 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add support for i945G This just adds the defines and structure for i945G Signed-off-by: Dave Airlie commit 0c187addabbaf93512902442b4a90140a21b0ddc tree 40cd618a76474ec9ba2cfde129315c7ebbaf4f9f parent 16109b3f4c1f2635afd32eb6d49348590de2cb25 author Dave Airlie Thu, 23 Mar 2006 11:20:08 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: enable on x86_64 i945G chipsets supports 64-bit. Signed-off-by: Dave Airlie commit 16109b3f4c1f2635afd32eb6d49348590de2cb25 tree 6a8777173acbc8d41fdcce615b899446eba8053b parent 8492f081e5552ff388068f612eae6f55f7210ed4 author Dave Airlie Mon, 20 Mar 2006 21:22:09 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add p divisor increments for i9xx. Signed-off-by: Dave Airlie commit 8492f081e5552ff388068f612eae6f55f7210ed4 tree 8d86450eea6a761ef4a541a5f67a9401f88aac19 parent d024960cff5173bef6e83c01cf9cd2763c2c0ab0 author Dave Airlie Mon, 20 Mar 2006 20:54:12 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: change splitm to be brute force The old splitm didn't always work use a brute force. Signed-off-by: Dave Airlie commit d024960cff5173bef6e83c01cf9cd2763c2c0ab0 tree a63dfaf6de88b82b2aaf892e741881e4e602befb parent 7258b11d2e9a47d2b01620622579f22906960e1a author Dave Airlie Mon, 20 Mar 2006 20:26:45 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: add pll index to the intelfb structure Add the pll index into the information structure, change get_chipset to take only the info structure, use plls in correct places commit 7258b11d2e9a47d2b01620622579f22906960e1a tree cfc7fce74a518077b0d068c13da710e072a57b20 parent 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 author Dave Airlie Mon, 20 Mar 2006 20:02:24 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: prepare for i9xx support. This code just moves the PLL min/max calculations variables into a structure, it doesn't change or add any new functionality. Signed-off-by: Dave Airlie commit 58a7ce64426394a46e80cdc9440cc1e7c195e85d tree a33f3a552c22deb4a47976eb67d1a557d7fed29e parent b0348b90a4a8149e5a0df312ab7810793ba7b3a4 author Krzysztof Halasa Thu, 30 Mar 2006 17:01:53 +0200 committer Jeff Garzik Sat, 01 Apr 2006 14:32:52 -0500 [PATCH] Goramo PCI200SYN WAN driver subsystem ID patch Goramo finally got PCI subsystem ID for their PCI200SYN card. The attached patch adds support for it - cards with old EEPROM data will emit a warning with URL for update tool. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit b0348b90a4a8149e5a0df312ab7810793ba7b3a4 tree b2880d09ba55a08acb98dcf8062dd99e59e733e8 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Lennert Buytenhek Tue, 28 Mar 2006 17:19:50 +0200 committer Jeff Garzik Sat, 01 Apr 2006 14:32:52 -0500 [PATCH] smc91x: add support for LogicPD PXA270 platform This patch adds support for the smc91x on the LogicPD PXA270 to the smc91x driver. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik