1. 18 1月, 2012 9 次提交
  2. 13 1月, 2012 3 次提交
    • K
      Merge remote branch 'wireless-next/master' into ath6kl-next · a0afd4f7
      Kalle Valo 提交于
      Conflicts:
      	drivers/net/wireless/ath/ath6kl/usb.c
      a0afd4f7
    • R
      ath6kl: Remove useless initialization in ath6kl_read_fwlogs() · e80ec84d
      Raja Mani 提交于
      ath6kl_read_fwlogs() assigns the value zero to the variable 'ret'
      at the time of declaration. Later, return value of ath6kl_diag_read32()
      repalces the init value. Hence removing useless zero assignment.
      Signed-off-by: NRaja Mani <rmani@qca.qualcomm.com>
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      e80ec84d
    • T
      ath6kl: Add support for uAPSD · c1762a3f
      Thirumalai Pachamuthu 提交于
      * A new APSD power save queue is added in the station structure.
      * When a station has APSD capability and goes to power save, the frame
        designated to the station will be buffered in APSD queue.
      * When the host receives a frame which the firmware marked as trigger,
        host delivers the buffered frame from the APSD power save queue.
        Number of frames to deliver is decided by MAX SP length.
      * When a station moves from sleep to awake state, all frames buffered
        in APSD power save queue are sent to the firmware.
      * When a station is disconnected, all frames bufferes in APSD power save
        queue are dropped.
      * When the host queues the first frame to the APSD queue or removes the
        last frame from the APSD queue, it is indicated to the firmware using
        WMI_AP_APSD_BUFFERED_TRAFFIC_CMD.
      
      kvalo: fix buggy handling of sks queues, made it more obvious
      the user priority when wmm is disabled, remove unneed else block and
      combined some variable declarations
      Signed-off-by: NThirumalai Pachamuthu <tpachamu@qca.qualcomm.com>
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      c1762a3f
  3. 12 1月, 2012 4 次提交
    • S
      ath6kl: Fix listen interval handling · 8232736d
      Sujith Manoharan 提交于
      This patch addresses a few problems with the commit:
      
      "ath6kl: Implement support for listen interval from userspace"
      
      * The debugfs file required for reading/writing the listen interval
        wasn't created. Fix this.
      
      * The interface index was being hardcoded to zero. Fix this.
      
      * Two separate parameters, "listen_interval_time and listen_interval_beacons"
        were being used. This fails to work as expected because the FW assigns
        higher precedence to "listen_interval_beacons" and "listen_interval_time"
        ends up being never used at all.
      
        To handle this, fix the host driver to exclusively use listen interval
        based on units of beacon intervals.
      
      To set the listen interval, a user would now do something like this:
      
      echo "10" > /sys/kernel/debug/ieee80211/*/ath6kl/listen_interval
      
      kvalo: fix two checkpatch warnings
      Signed-off-by: NSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      8232736d
    • S
      ath6kl: Initialize a variable properly · cbec267a
      Sujith Manoharan 提交于
      This prevents 'comp_pktq' from being used in an
      incorrect manner.
      Signed-off-by: NSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      cbec267a
    • S
      ath6kl: Remove redundant pointer check · 4a8ce2fd
      Sujith Manoharan 提交于
      'params' is already used earlier and there is no point
      in checking for a NULL condition again.
      Signed-off-by: NSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      4a8ce2fd
    • S
      ath6kl: Fix SDIO error path · 866dc886
      Sujith Manoharan 提交于
      sdio_release_host() would be called twice if sdio_set_block_size()
      fails for some reason, which would result in the following warning.
      
      WARNING: at /home/sujith/dev/wireless-testing/drivers/mmc/core/core.c:828 mmc_release_host+0x42/0x50 [mmc_core]()
      
      Call Trace:
      [<ffffffff81064fdf>] warn_slowpath_common+0x7f/0xc0
      [<ffffffff8106503a>] warn_slowpath_null+0x1a/0x20
      [<ffffffffa03beb42>] mmc_release_host+0x42/0x50 [mmc_core]
      [<ffffffffa03c917e>] sdio_release_host+0x1e/0x30 [mmc_core]
      [<ffffffffa053fac7>] ath6kl_sdio_config+0xc7/0x110 [ath6kl_sdio]
      [<ffffffffa053fd2c>] ath6kl_sdio_probe+0x21c/0x320 [ath6kl_sdio]
      [<ffffffffa03beb2a>] ? mmc_release_host+0x2a/0x50 [mmc_core]
      [<ffffffffa03c7d2a>] sdio_bus_probe+0xfa/0x130 [mmc_core]
      [<ffffffff813015ae>] driver_probe_device+0x7e/0x1b0
      [<ffffffff8130178b>] __driver_attach+0xab/0xb0
      [<ffffffff813016e0>] ? driver_probe_device+0x1b0/0x1b0
      [<ffffffff813016e0>] ? driver_probe_device+0x1b0/0x1b0
      [<ffffffff81300504>] bus_for_each_dev+0x64/0xa0
      [<ffffffff8130123e>] driver_attach+0x1e/0x20
      [<ffffffff81300e80>] bus_add_driver+0x1b0/0x280
      [<ffffffffa0065000>] ? 0xffffffffa0064fff
      [<ffffffff81301d06>] driver_register+0x76/0x140
      [<ffffffffa0065000>] ? 0xffffffffa0064fff
      [<ffffffffa03c7b71>] sdio_register_driver+0x21/0x30 [mmc_core]
      [<ffffffffa0065012>] ath6kl_sdio_init+0x12/0x35 [ath6kl_sdio]
      [<ffffffff81002042>] do_one_initcall+0x42/0x180
      [<ffffffff810b025f>] sys_init_module+0x8f/0x200
      [<ffffffff81425ac2>] system_call_fastpath+0x16/0x1b
      Signed-off-by: NSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      866dc886
  4. 10 1月, 2012 7 次提交
  5. 09 1月, 2012 9 次提交
  6. 08 1月, 2012 6 次提交
  7. 07 1月, 2012 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 356b9542
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)
        m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
        m68k/serial: Remove references to obsolete serial config options
        m68k/net: Remove obsolete IRQ_FLG_* users
        m68k: Don't comment out syscalls used by glibc
        m68k/atari: Move declaration of atari_SCC_reset_done to header file
        m68k/serial: Remove references to obsolete CONFIG_SERIAL167
        m68k/hp300: Export hp300_ledstate
        m68k: Initconst section fixes
        m68k/mac: cleanup macro case
        mac_scsi: fix mac_scsi on some powerbooks
        m68k/mac: fix powerbook 150 adb_type
        m68k/mac: fix baboon irq disable and shutdown
        m68k/mac: oss irq fixes
        m68k/mac: fix nubus slot irq disable and shutdown
        m68k/mac: enable via_alt_mapping on performa 580
        m68k/mac: cleanup forward declarations
        m68k/mac: cleanup mac_irq_pending
        m68k/mac: cleanup mac_clear_irq
        m68k/mac: early console
        m68k/mvme16x: Add support for EARLY_PRINTK
        ...
      
      Fix up trivial conflict in arch/m68k/Kconfig.debug due to new
      EARLY_PRINTK config option addition clashing with movement of the
      BOOTPARAM options.
      356b9542
    • L
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 770e1b03
      Linus Torvalds 提交于
      * 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)
        ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h
        ARM: 7269/1: mach-sa1100: fix sched_clock breakage
        ARM: 7198/1: arm/imx6: add restart support for imx6q
        ARM: restart: remove the now empty arch_reset()
        ARM: restart: remove comments about adding code to arch_reset()
        ARM: restart: lpc32xx & u300: remove unnecessary printk
        ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook
        ARM: restart: w90x900: use new restart hook
        ARM: restart: Versatile Express: use new restart hook
        ARM: restart: versatile: use new restart hook
        ARM: restart: u300: use new restart hook
        ARM: restart: tegra: use new restart hook
        ARM: restart: spear: use new restart hook
        ARM: restart: shark: use new restart hook
        ARM: restart: sa1100: use new restart hook
        ARM: 7252/1: restart: S5PV210: use new restart hook
        ARM: 7251/1: restart: S5PC100: use new restart hook
        ARM: 7250/1: restart: S5P64X0: use new restart hook
        ARM: 7266/1: restart: S3C64XX: use new restart hook
        ARM: 7265/1: restart: S3C24XX: use new restart hook
        ...
      
      Fix up trivial conflict in arch/arm/mm/init.c due to removal of
      memblock_init() clashing with the movement of the sorting of the meminfo
      array.
      770e1b03