1. 04 6月, 2007 5 次提交
    • M
      [TG3]: Fix link problem on Dell's onboard 5906. · 007a880d
      Michael Chan 提交于
      The bug is caused by code that always set
      (TG3_FLAG_USE_MI_INTERRUPT | TG3_FLAG_USE_LINKCHG_REG) on all Dell's
      onboard devices.  With these 2 flags set, the link status is polled
      by tg3_timer() and will only work when the PHY is set up to interrupt
      the MAC on link changes.  This breaks 5906 because the 5906 PHY does
      not support TG3_FLAG_USE_MI_INTERRUPT the same as other PHYs.
      
      For correctness, only Dell's onboard 5701 needs these 2 flags to be
      set.  This change will fix the 5906 problem and will change other
      Dell devices except 5700 and 5701 to use the more efficient
      interrupt-driven link changes.
      
      Update version to 3.77.
      Signed-off-by: NMichael Chan <mchan@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      007a880d
    • D
      [AF_UNIX]: Make socket locking much less confusing. · 1c92b4e5
      David S. Miller 提交于
      The unix_state_*() locking macros imply that there is some
      rwlock kind of thing going on, but the implementation is
      actually a spinlock which makes the code more confusing than
      it needs to be.
      
      So use plain unix_state_lock and unix_state_unlock.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1c92b4e5
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · c1a13ff5
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        NET: add MAINTAINERS entry for ucc_geth driver
        myri10ge: report link up/down in standard ethtool way
        NetXen: Removal of extra free_irq call
        Update tulip maintainer email address
        smc91x: sh solution engine fixes.
        e1000: disable polling before registering netdevice
        network drivers: eliminate unneeded kill_vid code
        atl1: eliminate unneeded kill_vid code
        8139cp: fix VLAN unregistration
        sky2: Fix VLAN unregistration
        VLAN: kill_vid is only useful for VLAN filtering devices
        qla3xxx: device doesnt do hardware checksumming.
      c1a13ff5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 7dfb1716
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] clean-up watchdog documentation
        [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver
      7dfb1716
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 20c4856b
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix zImage.coff generation for 32-bit pmac
        [POWERPC] Fix compile breakage for IBM/AMCC 4xx arch/ppc platforms
        [POWERPC] Don't allow PMAC_APM_EMU for 64-bit
        [POWERPC] Compare irq numbers with NO_IRQ not IRQ_NONE
        [POWERPC] Fix return from pte_alloc_one() in out-of-memory case
        [POWERPC] Fix compile warning in pseries xics code
        [POWERPC] Don't use HOSTCFLAGS in BOOTCFLAGS
        [POWERPC] Create a zImage for legacy iSeries
        [POWERPC] pasemi idle uses hard_smp_processor_id
        [POWERPC] ps3/interrupt.c uses get_hard_smp_processor_id
        [POWERPC] Fix possible access to free pages
        [POWERPC] Fix compiler/assembler flags for Ebony platform boot files
        [POWERPC] Fix ppc32 single-stepping out of syscalls
        [POWERPC] Update documentation for of_find_node_by_type()
      20c4856b
  2. 03 6月, 2007 12 次提交
  3. 02 6月, 2007 18 次提交
  4. 01 6月, 2007 5 次提交