1. 15 Oct, 2009 3 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · c3da3148
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
        vmxnet: fix 2 build problems
        net: add support for STMicroelectronics Ethernet controllers.
        net: ks8851_mll uses mii interfaces
        net/fec_mpc52xx: Fix kernel panic on FEC error
        net: Fix OF platform drivers coldplug/hotplug when compiled as modules
        TI DaVinci EMAC: Clear statistics register properly.
        r8169: partial support and phy init for the 8168d
        irda/sa1100_ir: check return value of startup hook
        udp: Fix udp_poll() and ioctl()
        WAN: fix Cisco HDLC handshaking.
        tcp: fix tcp_defer_accept to consider the timeout
        3c574_cs: spin_lock the set_multicast_list function
        net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs
        netxen: fix pci bar mapping
        ethoc: fix warning from 32bit build
        libertas: fix build
        net: VMware virtual Ethernet NIC driver: vmxnet3
        net: Fix IXP 2000 network driver building.
        libertas: fix build
        mac80211: document ieee80211_rx() context requirement
        ...
      c3da3148
    • Linus Torvalds's avatar
      Merge the right tty-fixes branch · bd070411
      Linus Torvalds authored
      * branch 'tty-fixes'
        tty: use the new 'flush_delayed_work()' helper to do ldisc flush
        workqueue: add 'flush_delayed_work()' to run and wait for delayed work
        tty: Make flush_to_ldisc() locking more robust
      bd070411
    • Randy Dunlap's avatar
      vmxnet: fix 2 build problems · 8f7e524c
      Randy Dunlap authored
      vmxnet3 uses in_dev* interfaces so it should depend on INET.
      Also fix so that the driver builds when CONFIG_PCI_MSI is disabled.
      
      vmxnet3_drv.c:(.text+0x2a88cb): undefined reference to `in_dev_finish_destroy'
      
      drivers/net/vmxnet3/vmxnet3_drv.c:1335: error: 'struct vmxnet3_intr' has no member named 'msix_entries'
      drivers/net/vmxnet3/vmxnet3_drv.c:1384: error: 'struct vmxnet3_intr' has no member named 'msix_entries'
      drivers/net/vmxnet3/vmxnet3_drv.c:2137: error: 'struct vmxnet3_intr' has no member named 'msix_entries'
      drivers/net/vmxnet3/vmxnet3_drv.c:2138: error: 'struct vmxnet3_intr' has no member named 'msix_entries'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarBhavesh davda <bhavesh@vmware.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8f7e524c
  2. 14 Oct, 2009 37 commits