1. 02 5月, 2009 6 次提交
  2. 01 5月, 2009 9 次提交
  3. 30 4月, 2009 23 次提交
  4. 29 4月, 2009 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 3dacbdad
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
        e100: do not go D3 in shutdown unless system is powering off
        netfilter: revised locking for x_tables
        Bluetooth: Fix connection establishment with low security requirement
        Bluetooth: Add different pairing timeout for Legacy Pairing
        Bluetooth: Ensure that HCI sysfs add/del is preempt safe
        net: Avoid extra wakeups of threads blocked in wait_for_packet()
        net: Fix typo in net_device_ops description.
        ipv4: Limit size of route cache hash table
        Add reference to CAPI 2.0 standard
        Documentation/isdn/INTERFACE.CAPI
        update Documentation/isdn/00-INDEX
        ixgbe: Fix WoL functionality for 82599 KX4 devices
        veth: prevent oops caused by netdev destructor
        xfrm: wrong hash value for temporary SA
        forcedeth: tx timeout fix
        net: Fix LL_MAX_HEADER for CONFIG_TR_MODULE
        mlx4_en: Handle page allocation failure during receive
        mlx4_en: Fix cleanup flow on cq activation
        vlan: update vlan carrier state for admin up/down
        netfilter: xt_recent: fix stack overread in compat code
        ...
      3dacbdad
    • T
      e100: do not go D3 in shutdown unless system is powering off · ac7c992c
      Thadeu Lima de Souza Cascardo 提交于
      After experimenting with kexec with the last merges after 2.6.29, I've
      had some problems when probing e100.  It would not read the eeprom.  After
      some bisects, I realized this has been like that since forever (at least
      2.6.18).  The problem is that shutdown is doing the same thing that
      suspend does and puts the device in D3 state.  I couldn't find a way to
      get the device back to a sane state in the probe function.  So, based on
      some similar patches from Rafael J. Wysocki for e1000, e1000e, and ixgbe,
      I wrote this one for e100.
      Signed-off-by: NThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
      Acked-by: N"Rafael J. Wysocki" <rjw@sisk.pl>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ac7c992c