1. 10 9月, 2010 7 次提交
  2. 06 9月, 2010 29 次提交
  3. 29 8月, 2010 4 次提交
    • L
      Linux 2.6.36-rc3 · 2bfc96a1
      Linus Torvalds 提交于
      2bfc96a1
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 994b384a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: ohci: work around VIA and NEC PHY packet reception bug
        firewire: core: do not use del_timer_sync() in interrupt context
        firewire: net: fix unicast reception RCODE in failure paths
        firewire: sbp2: fix stall with "Unsolicited response"
        firewire: sbp2: fix memory leak in sbp2_cancel_orbs or at send error
        ieee1394: Adjust confusing if indentation
      994b384a
    • S
      firewire: ohci: work around VIA and NEC PHY packet reception bug · a4dc090b
      Stefan Richter 提交于
      VIA VT6306, VIA VT6308, and NEC OrangeLink controllers do not write
      packet event codes for received PHY packets (or perhaps write
      evt_no_status, hard to tell).  Work around it by overwriting the
      packet's ACK by ack_complete, so that upper layers that listen to PHY
      packet reception get to see these packets.
      
      (Also tested:  TI TSB82AA2, TI TSB43AB22/A, TI XIO2213A, Agere FW643,
      JMicron JMB381 --- these do not exhibit this bug.)
      
      Clemens proposed a quirks flag for that, IOW whitelist known misbehaving
      controllers for this workaround.  Though to me it seems harmless enough
      to enable for all controllers.
      
      The log_ar_at_event() debug log will continue to show the original
      status from the DMA unit.
      
      Reported-by: Clemens Ladisch <clemens@ladisch.de> (VT6308)
      Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
      a4dc090b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 29cfcddc
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        net/ipv4: Eliminate kstrdup memory leak
        net/caif/cfrfml.c: use asm/unaligned.h
        ax25: missplaced sock_put(sk)
        qlge: reset the chip before freeing the buffers
        l2tp: test for ethernet header in l2tp_eth_dev_recv()
        tcp: select(writefds) don't hang up when a peer close connection
        tcp: fix three tcp sysctls tuning
        tcp: Combat per-cpu skew in orphan tests.
        pxa168_eth: silence gcc warnings
        pxa168_eth: update call to phy_mii_ioctl()
        pxa168_eth: fix error handling in prope
        pxa168_eth: remove unneeded null check
        phylib: Fix race between returning phydev and calling adjust_link
        caif-driver: add HAS_DMA dependency
        3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx
        qlcnic: fix poll implementation
        netxen: fix poll implementation
        bridge: netfilter: fix a memory leak
      29cfcddc