1. 14 Aug, 2011 3 commits
    • Julia Lawall's avatar
      drivers/net/can/sja1000/plx_pci.c: eliminate double free · 951f2f96
      Julia Lawall authored
      In this code, the failure_cleanup label calls the function
      plx_pci_del_card, which frees everything in the card->net_dev array.  dev
      is placed in this array immediately after allocation, so the two subsequent
      jumps to failure_cleanup should not also call free_sja1000dev, but the
      second one does.
      
      If plx_pci_check_sja1000 fails, then free_sja1000dev is also called on
      dev.  Because dev is already in the card->net_dev array, this implies that
      when plx_pci_del_card is later called, it may get freed again.  So that
      entry is reset to NULL after the free.
      
      Finally, if there is a problem with one channel, there will be a hole in the
      array.  card->channels counts the number of channels that have succeeded,
      and does not keep track of the index of the largest element in the array
      that is valid.  So the loop in plx_pci_del_card is changed to go up to
      PLX_PCI_MAX_CHAN, which is only 2.
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      951f2f96
    • Josh Boyer's avatar
      usbnet/cdc_ncm: Don't use stack variables for DMA · 75bc8ef5
      Josh Boyer authored
      The cdc_ncm driver still has a few places where stack variables are
      passed to the cdc_ncm_do_request function.  This triggers a stack trace in
      lib/dma-debug.c if the CONFIG_DEBUG_DMA_API option is set.
      
      Adjust these calls to pass parameters that have been allocated with
      kzalloc.
      Signed-off-by: default avatarJosh Boyer <jwboyer@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      75bc8ef5
    • Jesse Gross's avatar
      vmxnet3: Don't enable vlan filters in promiscuous mode. · f6957f88
      Jesse Gross authored
      The vmxnet3 driver enables vlan filters if filtering is enabled for
      any vlan.  In promiscuous mode the filter table is cleared to in
      order to disable filtering.  However, if a vlan device is subsequently
      created that vlan will be added to the filter, re-engaging it.  As a
      result, not only do we not see all the vlans in promiscuous mode, we
      don't even see vlans for which a filter was previously created.
      
      CC: Scott J. Goldman <scottjg@vmware.com>
      CC: Shreyas Bhatewara <sbhatewara@vmware.com>
      CC: VMware PV-Drivers <pv-drivers@vmware.com>
      Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarShreyas N Bhatewara <sbhatewara@vmware.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f6957f88
  2. 13 Aug, 2011 11 commits
    • David S. Miller's avatar
    • Bruce Allan's avatar
      e1000e: workaround invalid Tx/Rx tail descriptor register write · c6e7f51e
      Bruce Allan authored
      When the Manageability Engine (ME) is enabled on 82579, it periodically
      accesses some MAC CSR registers.  There is an arbiter in hardware which
      prevents simultaneous access of these registers by the host software, i.e.
      the driver.  There is a hardware bug in the aribter that signals a host
      access of the registers later than it actually happens.  A write of the
      Transmit or Receive Descriptor Tail register could result in an incorrect
      value if the driver and ME perform simultaneous accesses which could result
      in an access to an invalid memory address.  This would return an
      Unsupported Request which could hang the hardware.  Workaround the issue by
      checking the FWSM register bit24 which is set by ME before it accesses the
      MAC CSR registers.
      Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
      Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      c6e7f51e
    • Bruce Allan's avatar
      e1000e: workaround for packet drop on 82579 at 100Mbps · 0ed013e2
      Bruce Allan authored
      The MAC can drop short packets when the PHY detects noise on the line at
      100Mbps due to a timing issue.  Workaround the issue by increasing the PLL
      counter so the PHY properly recognizes the synchronization pattern from the
      MAC.
      Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
      Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      0ed013e2
    • Bruce Allan's avatar
      e1000e: Spurious interrupts & dropped packets with 82577/8/9 in half-duplex · 1d2101a7
      Bruce Allan authored
      On 82577/8/9 in half-duplex when a received packet is passed from the PHY
      to the MAC, if too many preamble octects are stripped from the packet
      before arriving at the MAC, it can be misintrepeted as an in-band message
      rather than an actual frame.  For example, if the frame contents resembled
      an interrupt request in-band message, it would trigger a false interrupt.
      In most cases, the packet is just dropped.
      
      By reducing the number of preamble octets stripped from the beginning of
      the frame when passing it from the PHY to the MAC, the MAC will interpret
      the frame properly.
      
      An additional uses of the magic PHY_REG(770, 16) have been updated with a
      define introduced with this patch.
      Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
      Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      1d2101a7
    • Alexander Duyck's avatar
      ixgbe: Fix FCOE memory leak for DDP packets · 63d635b2
      Alexander Duyck authored
      This patch is meant to fix a memory leak found via code review for FCOE.
      Specifically on DDP flows the SKBs were being dropped without being
      recycled, freed, or given to the stack.
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
      Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      63d635b2
    • Linus Torvalds's avatar
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · 73e0881d
      Linus Torvalds authored
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        dt: add empty of_get_property for non-dt
      73e0881d
    • Linus Torvalds's avatar
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · e211bc8d
      Linus Torvalds authored
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (30 commits)
        USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
        USB: Serial: Add device ID for Sierra Wireless MC8305
        USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G
        usb/host/pci-quirks.c: correct annotation of `ehci_dmi_nohandoff_table'
        USB: option driver: add PID for Vodafone-Huawei K4511
        USB: option driver: add PID for Vodafone-Huawei K4510
        USB: option driver: add PID for Vodafone-Huawei K3771
        USB: option driver: add PID for Vodafone-Huawei K3770
        usb: serial: ftdi_sio.c: For the FT232H FTDI_SIO_SET_BAUDRATE_REQUEST, index needs to be shifted too
        usb/isp1760: Added missing call to usb_hcd_check_unlink_urb() during unlink
        USB: EHCI: Fix test mode sequence
        USB: ftdi_sio: fix minor typo in get_ftdi_divisor
        USB: at91_udc: include linux/prefetch.h explicitly
        USB: usb-storage: unusual_devs entry for ARM V2M motherboard.
        usb/ehci-mxc: add missing inclusion of mach/hardware.h
        USB: assign instead of equal in usbtmc.c
        usb: renesas_usbhs: fixup usbhsg_for_each_uep 1st pos
        usb: renesas_usbhs: fix DMA build by including dma-mapping.h
        usb: gadget: net2272 - Correct includes
        usb: musb: fix oops on musb_gadget_pullup
        ...
      e211bc8d
    • Linus Torvalds's avatar
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 8c70aac0
      Linus Torvalds authored
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        zcache: Fix build error when sysfs is not defined
        zcache: Use div_u64 for 64-bit division
        staging:rts_pstor: fix thread synchronization flow
        drivers:staging:solo6x10:add the missed slab.h
        staging: zcache: include module.h for MODULE_LICENSE
        drivers/staging/hv/blkvsc_drv.c: eliminate NULL pointer dereference
        Staging: Add clk API note to nvec/TODO
        drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: adjust array index
        staging: more missing slab.h inclusions
        drivers/staging/solo6x10/p2m.c needs slab.h
        drivers/staging/solo6x10/core.c needs slab.h
        drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h
        drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error
        Staging: iio: add some unlocks to raw_read() functions
        staging: ft1000_proc needs asm/io.h for inw/outw on sparc
        staging: rtl8192u: declare MODULE_FIRMWARE
        gma500: Fix clashes with DRM updates
        staging: zcache: module is GPL
        staging: fix zcache building
      8c70aac0
    • Linus Torvalds's avatar
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip · 06e727d2
      Linus Torvalds authored
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip:
        x86-64: Rework vsyscall emulation and add vsyscall= parameter
        x86-64: Wire up getcpu syscall
        x86: Remove unnecessary compile flag tweaks for vsyscall code
        x86-64: Add vsyscall:emulate_vsyscall trace event
        x86-64: Add user_64bit_mode paravirt op
        x86-64, xen: Enable the vvar mapping
        x86-64: Work around gold bug 13023
        x86-64: Move the "user" vsyscall segment out of the data segment.
        x86-64: Pad vDSO to a page boundary
      06e727d2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · e68ff9cd
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: replace xfs_buf_geterror() with bp->b_error
        xfs: Check the return value of xfs_buf_read() for NULL
        "xfs: fix error handling for synchronous writes" revisited
        xfs: set cursor in xfs_ail_splice() even when AIL was empty
        xfs: Remove the macro XFS_BUFTARG_NAME
        xfs: Remove the macro XFS_BUF_TARGET
        xfs: Remove the macro XFS_BUF_SET_TARGET
        Replace the macro XFS_BUF_ISPINNED with helper xfs_buf_ispinned
        xfs: Remove the macro XFS_BUF_SET_PTR
        xfs: Remove the macro XFS_BUF_PTR
        xfs: Remove macro XFS_BUF_SET_START
        xfs: Remove macro XFS_BUF_HOLD
        xfs: Remove macro XFS_BUF_BUSY and family
        xfs: Remove the macro XFS_BUF_ERROR and family
        xfs: Remove the macro XFS_BUF_BFLAGS
      e68ff9cd
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · c44efbaa
      Linus Torvalds authored
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (32 commits)
        ARM: mmp: Change the way we use timer 0 as clockevent timer.
        ARM: mmp: Switch to using timer 1 as clocksource timer.
        ARM: mmp: Also start timer 1 on boot.
        ARM: pxa168/gplugd: free correct GPIO
        ARM: pxa168/gplugd: get rid of mfp-gplugd.h
        ARM: pxa: fix logic error in PJ4 iWMMXt handling
        mach-sa1100: fix PCI build problem
        omap: timer: Set dmtimer used as clocksource in autoreload mode
        OMAP3: am3517crane: remove NULL board_mux from board file
        arm: mach-omap2: mux: use kstrdup()
        arch:arm:plat-omap:iovmm: remove unused variable 'va'
        Update Nook Color machine 3284 to common Encore name
        am3505/3517: Various platform defines for UART4
        OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds
        OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds
        iMX: Fix build for iMX53
        ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage
        OMAP2+: PM: SmartReflex: use put_sync_suspend for IRQ-safe disabling
        OMAP3: beagle: don't touch omap_device internals
        OMAP1: enable GENERIC_IRQ_CHIP
        ...
      c44efbaa
  3. 12 Aug, 2011 12 commits
  4. 11 Aug, 2011 14 commits