1. 20 Jun, 2006 13 commits
    • Herbert Xu's avatar
      [NET]: Prevent multiple qdisc runs · 48d83325
      Herbert Xu authored
      Having two or more qdisc_run's contend against each other is bad because
      it can induce packet reordering if the packets have to be requeued.  It
      appears that this is an unintended consequence of relinquinshing the queue
      lock while transmitting.  That in turn is needed for devices that spend a
      lot of time in their transmit routine.
      
      There are no advantages to be had as devices with queues are inherently
      single-threaded (the loopback device is not but then it doesn't have a
      queue).
      
      Even if you were to add a queue to a parallel virtual device (e.g., bolt
      a tbf filter in front of an ipip tunnel device), you would still want to
      process the queue in sequence to ensure that the packets are ordered
      correctly.
      
      The solution here is to steal a bit from net_device to prevent this.
      
      BTW, as qdisc_restart is no longer used by anyone as a module inside the
      kernel (IIRC it used to with netif_wake_queue), I have not exported the
      new __qdisc_run function.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      48d83325
    • Evgeniy Polyakov's avatar
      [CONNECTOR]: Initialize subsystem earlier. · d6cc7f1a
      Evgeniy Polyakov authored
      Attached patch declares connector init function as subsys_init()
      and returns -EAGAIN in case connector is not initialized yet.
      Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d6cc7f1a
    • Patrick McHardy's avatar
      [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length · d3dcd4ef
      Patrick McHardy authored
      Fix endless loop in the SCTP match similar to those already fixed in
      the SCTP conntrack helper (was CVE-2006-1527).
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d3dcd4ef
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 25f42b6a
      Linus Torvalds authored
      * '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.
        ...
      25f42b6a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 4c84a39c
      Linus Torvalds authored
      * '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 <rdma/ib_smi.h>
        IPoIB: Handle client reregister events
        IB: Add client reregister event type
        ...
      4c84a39c
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · d0b952a9
      Linus Torvalds authored
      * 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
      d0b952a9
    • Linus Torvalds's avatar
      Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 · d90125bf
      Linus Torvalds authored
      * '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
        ...
      d90125bf
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart · bfd189a8
      Linus Torvalds authored
      * 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()
      bfd189a8
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq · bbf70132
      Linus Torvalds authored
      * 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
      bbf70132
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 2090af71
      Linus Torvalds authored
      * '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
        ...
      2090af71
    • Linus Torvalds's avatar
      Add support for suspending and resuming the whole console subsystem · 557240b4
      Linus Torvalds authored
      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: default avatarLinus Torvalds <torvalds@osdl.org>
      557240b4
    • Linus Torvalds's avatar
      Make sure to re-enable SCI after an ACPI suspend · 56035091
      Linus Torvalds authored
      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: default avatarLinus Torvalds <torvalds@osdl.org>
      56035091
    • Linus Torvalds's avatar
      Improve SATA core suspend/resume · 1cca0ebb
      Linus Torvalds authored
      Doing a full ata_busy_sleep() seems to get suspend and resume working
      fine on the Apple Mac Mini, at least.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      1cca0ebb
  2. 19 Jun, 2006 27 commits