1. 02 6月, 2010 1 次提交
  2. 29 5月, 2010 5 次提交
  3. 27 5月, 2010 2 次提交
    • C
      ar9170usb: fix read from freed driver context · 50019600
      Christian Lamparter 提交于
      Commit "ar9170: wait for asynchronous firmware loading"
      introduced a bug, which is triggered by fatal errors
      while the driver is initializing the device.
      
      BUG: unable to handle kernel paging request at 6b6b6bf7
      IP: [<c117b567>] kobject_put+0x7/0x70
      *pde = 00000000
      Oops: 0000 [#1] PREEMPT
      last sysfs file: /sys/devices/platform/hdaps/position
      Modules linked in: ar9170usb [...]
      
      Pid: 6246, comm: firmware/ar9170 Not tainted 2.6.34-wl #54
      EIP: 0060:[<c117b567>] EFLAGS: 00010206 CPU: 0
      EIP is at kobject_put+0x7/0x70
      EAX: 6b6b6bd7 EBX: f4d3d0e0 ECX: f5ba9124 EDX: f6af2a7c
      ESI: 00000000 EDI: f4d3d0e0 EBP: 00000000 ESP: f5e98f9c
       DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
      Process firmware/ar9170 (pid: 6246)
      Stack:
       c12532ed 00000246 f5bfaa70 f8487353 f4d3d0e0
      Call Trace:
       [<c12532ed>] ? device_release_driver+0x1d/0x30
       [<f8487353>] ? ar9170_usb_firmware_failed+0x43/0x70 [ar9170usb]
       [<c125983c>] ? request_firmware_work_func+0x2c/0x70
       [<c1259810>] ? request_firmware_work_func+0x0/0x70
       [<c10413f4>] ? kthread+0x74/0x80
       [<c1041380>] ? kthread+0x0/0x80
       [<c1003136>] ? kernel_thread_helper+0x6/0x10
      Code: 40 d3 f2 ff 85 c0 89 c3 74 0a ba 44 86 4c c1 e8 [...]
      EIP: [<c117b567>] kobject_put+0x7/0x70 SS:ESP 0068:f5e98f9c
      CR2: 000000006b6b6bf7
      ---[ end trace e81abb992434b410 ]---
      Signed-off-by: NChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      50019600
    • J
      Revert "rt2x00: Fix rt2800usb TX descriptor writing." · b578bb49
      John W. Linville 提交于
      This reverts commit 663cb47c.
      
      This patch was merged out of the proper order, so instead of fixing a
      problem with a prior (unmerged) patch, it creates one.  Ooops!
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      b578bb49
  4. 25 5月, 2010 14 次提交
  5. 22 5月, 2010 7 次提交
  6. 21 5月, 2010 11 次提交
    • T
      net: fix problem in dequeuing from input_pkt_queue · 76cc8b13
      Tom Herbert 提交于
      Fix some issues introduced in batch skb dequeuing for input_pkt_queue.
      The primary issue it that the queue head must be incremented only
      after a packet has been processed, that is only after
      __netif_receive_skb has been called.  This is needed for the mechanism
      to prevent OOO packet in RFS.  Also when flushing the input_pkt_queue
      and process_queue, the process queue should be done first to prevent
      OOO packets.
      
      Because the input_pkt_queue has been effectively split into two queues,
      the calculation of the tail ptr is no longer correct.  The correct value
      would be head+input_pkt_queue->len+process_queue->len.  To avoid
      this calculation we added an explict input_queue_tail in softnet_data.
      The tail value is simply incremented when queuing to input_pkt_queue.
      Signed-off-by: NTom Herbert <therbert@google.com>
      Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      76cc8b13
    • O
      can: SJA1000 add missing spin_lock_init() · 1f01bfd2
      Oliver Hartkopp 提交于
      As remarked by Sam Ravnborg the spin_lock variable, that has been introduced
      in commit 57c8a456 ("can: Fix SJA1000 command
      register writes on SMP systems") has not been initialized properly.
      
      This patch adds the initialization to allow spinlock debugging.
      Signed-off-by: NOliver Hartkopp <socketcan@hartkopp.net>
      CC: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1f01bfd2
    • D
      sh_eth: Fix memleak in sh_mdio_release · 0f0b405c
      Denis Kirjanov 提交于
      Allocated memory for IRQs should be freed when releasing the mii_bus
      Signed-off-by: NDenis Kirjanov <dkirjanov@kernel.org>
      Acked-by: NNobuhiro Iwamatsu <iwamatsu@nigauri.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0f0b405c
    • D
    • H
      gro: Fix bogus gso_size on the first fraglist entry · 622e0ca1
      Herbert Xu 提交于
      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: NIgor Zhang <yugzhang@redhat.com>
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      622e0ca1
    • M
      ixgbe:add support for a new 82599 10G Base-T device · 119fc60a
      Mallikarjuna R Chilakala 提交于
      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: NMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      119fc60a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7a9b1492
      Linus Torvalds 提交于
      * 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
    • S
      sound: fixup for usb_buffer_alloc/free rename · 3d62e3fd
      Stephen Rothwell 提交于
      This is needed before the USB merge.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3d62e3fd
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · f8965467
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 · a26272e5
      Linus Torvalds 提交于
      * 'docs-next' of git://git.lwn.net/linux-2.6:
        Add a document describing the padata interface
      a26272e5
    • L
      Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6 · 7c6d87ac
      Linus Torvalds 提交于
      * 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits)
        viafb: move some include files to include/linux
        viafb: Eliminate some global.h references
        viafb: get rid of i2c debug cruft
        viafb: fold via_io.h into via-core.h
        viafb: Fix initialization error paths
        viafb: Do not remove gpiochip under spinlock
        viafb: make procfs entries optional
        viafb: fix proc entry removal
        viafb: improve misc register handling
        viafb: replace inb/outb
        viafb: move some modesetting functions to a seperate file
        viafb: unify modesetting functions
        viafb: Reserve framebuffer memory for the upcoming camera driver
        viafb: Add a simple VX855 DMA engine driver
        viafb: Add a simple interrupt management infrastructure
        via: Rationalize vt1636 detection
        viafb: Introduce viafb_find_i2c_adapter()
        via: Do not attempt I/O on inactive I2C adapters
        viafb: Turn GPIO and i2c into proper platform devices
        viafb: Convert GPIO and i2c to the new indexed port ops
        ...
      7c6d87ac