1. 21 May, 2010 5 commits
    • Herbert Xu's avatar
      gro: Fix bogus gso_size on the first fraglist entry · 622e0ca1
      Herbert Xu authored
      When GRO produces fraglist entries, and the resulting skb hits
      an interface that is incapable of TSO but capable of FRAGLIST,
      we end up producing a bogus packet with gso_size non-zero.
      
      This was reported in the field with older versions of KVM that
      did not set the TSO bits on tuntap.
      
      This patch fixes that.
      Reported-by: default avatarIgor Zhang <yugzhang@redhat.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      622e0ca1
    • Mallikarjuna R Chilakala's avatar
      ixgbe:add support for a new 82599 10G Base-T device · 119fc60a
      Mallikarjuna R Chilakala authored
      This adds support for a new copper device for 82599, device id 0x151c.
      This 82599 10GBase-T device uses the PHY's internal temperature sensor
      to guard against over-temp conditions. In this scenario the PHY will be
      put in a low power mode and link will no longer be able to transmit or
      receive any data. When this occurs, the over-temp interrupt is latched
      and driver logs this error message. A HW reset or power cycle is
      required to clear this status.
      Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      119fc60a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7a9b1492
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
        USB: remove unused usb_buffer_alloc and usb_buffer_free macros
        usb: musb: update gfp/slab.h includes
        USB: ftdi_sio: fix legacy SIO-device header
        USB: kl5usb105: reimplement using generic framework
        USB: kl5usb105: minor clean ups
        USB: kl5usb105: fix memory leak
        USB: io_ti: use kfifo to implement write buffering
        USB: io_ti: remove unsused private counter
        USB: ti_usb: use kfifo to implement write buffering
        USB: ir-usb: fix incorrect write-buffer length
        USB: aircable: fix incorrect write-buffer length
        USB: safe_serial: straighten out read processing
        USB: safe_serial: reimplement read using generic framework
        USB: safe_serial: reimplement write using generic framework
        usb-storage: always print quirks
        USB: usb-storage: trivial debug improvements
        USB: oti6858: use port write fifo
        USB: oti6858: use kfifo to implement write buffering
        USB: cypress_m8: use kfifo to implement write buffering
        USB: cypress_m8: remove unused drain define
        ...
      
      Fix up conflicts (due to usb_buffer_alloc/free renaming) in
      	drivers/input/tablet/acecad.c
      	drivers/input/tablet/kbtab.c
      	drivers/input/tablet/wacom_sys.c
      	drivers/media/video/gspca/gspca.c
      	sound/usb/usbaudio.c
      7a9b1492
    • Stephen Rothwell's avatar
      sound: fixup for usb_buffer_alloc/free rename · 3d62e3fd
      Stephen Rothwell authored
      This is needed before the USB merge.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3d62e3fd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · f8965467
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
        qlcnic: adding co maintainer
        ixgbe: add support for active DA cables
        ixgbe: dcb, do not tag tc_prio_control frames
        ixgbe: fix ixgbe_tx_is_paused logic
        ixgbe: always enable vlan strip/insert when DCB is enabled
        ixgbe: remove some redundant code in setting FCoE FIP filter
        ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
        ixgbe: fix header len when unsplit packet overflows to data buffer
        ipv6: Never schedule DAD timer on dead address
        ipv6: Use POSTDAD state
        ipv6: Use state_lock to protect ifa state
        ipv6: Replace inet6_ifaddr->dead with state
        cxgb4: notify upper drivers if the device is already up when they load
        cxgb4: keep interrupts available when the ports are brought down
        cxgb4: fix initial addition of MAC address
        cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
        cnic: Convert cnic_local_flags to atomic ops.
        can: Fix SJA1000 command register writes on SMP systems
        bridge: fix build for CONFIG_SYSFS disabled
        ARCNET: Limit com20020 PCI ID matches for SOHARD cards
        ...
      
      Fix up various conflicts with pcmcia tree drivers/net/
      {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
      wireless/orinoco/spectrum_cs.c} and feature removal
      (Documentation/feature-removal-schedule.txt).
      
      Also fix a non-content conflict due to pm_qos_requirement getting
      renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
      f8965467
  2. 20 May, 2010 35 commits