1. 18 Jan, 2012 4 commits
  2. 13 Jan, 2012 3 commits
    • Kalle Valo's avatar
      Merge remote branch 'wireless-next/master' into ath6kl-next · a0afd4f7
      Kalle Valo authored
      Conflicts:
      	drivers/net/wireless/ath/ath6kl/usb.c
      a0afd4f7
    • Raja Mani's avatar
      ath6kl: Remove useless initialization in ath6kl_read_fwlogs() · e80ec84d
      Raja Mani authored
      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: default avatarRaja Mani <rmani@qca.qualcomm.com>
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      e80ec84d
    • Thirumalai Pachamuthu's avatar
      ath6kl: Add support for uAPSD · c1762a3f
      Thirumalai Pachamuthu authored
      * 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: default avatarThirumalai Pachamuthu <tpachamu@qca.qualcomm.com>
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      c1762a3f
  3. 12 Jan, 2012 4 commits
    • Sujith Manoharan's avatar
      ath6kl: Fix listen interval handling · 8232736d
      Sujith Manoharan authored
      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: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      8232736d
    • Sujith Manoharan's avatar
      ath6kl: Initialize a variable properly · cbec267a
      Sujith Manoharan authored
      This prevents 'comp_pktq' from being used in an
      incorrect manner.
      Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      cbec267a
    • Sujith Manoharan's avatar
      ath6kl: Remove redundant pointer check · 4a8ce2fd
      Sujith Manoharan authored
      'params' is already used earlier and there is no point
      in checking for a NULL condition again.
      Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      4a8ce2fd
    • Sujith Manoharan's avatar
      ath6kl: Fix SDIO error path · 866dc886
      Sujith Manoharan authored
      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: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      866dc886
  4. 09 Jan, 2012 16 commits
  5. 07 Jan, 2012 13 commits
    • Dan Carpenter's avatar
      pktgen: set correct max and min in pktgen_setup_inject() · 26e29eed
      Dan Carpenter authored
      In 88271660 "pktgen: fix multiple queue warning" we added special
      logic to handle the case where ntxq is zero.  It's not clear to me that
      ntxq can actually be zero.  But if it were then we would set
      ->queue_map_min and ->queue_map_max to USHRT_MAX when probably we want
      to set them to zero?
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      26e29eed
    • David S. Miller's avatar
      smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h · 96dab45f
      David S. Miller authored
      The energy detect enable/disable code in the driver uses some
      register defines in this header unconditionally, so guarding
      the smscphy.h header include with CONFIG_SMSC_PHY leads to
      build failures in some configurations.
      Reported-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      96dab45f
    • Aurelien Jacobs's avatar
      asix: fix infinite loop in rx_fixup() · 6c15d74d
      Aurelien Jacobs authored
      At this point if skb->len happens to be 2, the subsequant skb_pull(skb, 4)
      call won't work and the skb->len won't be decreased and won't ever reach 0,
      resulting in an infinite loop.
      
      With an ASIX 88772 under heavy load, without this patch, rx_fixup() reaches
      an infinite loop in less than a minute. With this patch applied,
      no infinite loop even after hours of heavy load.
      Signed-off-by: default avatarAurelien Jacobs <aurel@gnuage.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6c15d74d
    • David S. Miller's avatar
      6d62a66e
    • Cesar Eduardo Barros's avatar
      r6040: fix typo in use of MCR0 register bits · 77e1e438
      Cesar Eduardo Barros authored
      Commit 4e16d6eb (r6040: define more MCR0
      register bits) added #define values for MCR0 register bits and converted
      uses of hardcoded magic values to uses of these defines.
      
      However, one of the conversions looks suspicious:
      
       #define MCR0		0x00	/* Control register 0 */
      +#define  MCR0_RCVEN	0x0002	/* Receive enable */
      +#define  MCR0_XMTEN	0x1000	/* Transmission enable */
      
       	/* Init RDC private data */
      -	lp->mcr0 = 0x1002;
      +	lp->mcr0 = MCR0_XMTEN | MCR0;
      
      I believe what was meant here was MCR0_XMTEN | MCR0_RCVEN, which makes
      sense and matches the original values.
      Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      77e1e438
    • Glauber Costa's avatar
      net: fix sock_clone reference mismatch with tcp memcontrol · f3f511e1
      Glauber Costa authored
      Sockets can also be created through sock_clone. Because it copies
      all data in the sock structure, it also copies the memcg-related pointer,
      and all should be fine. However, since we now use reference counts in
      socket creation, we are left with some sockets that have no reference
      counts. It matters when we destroy them, since it leads to a mismatch.
      Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
      CC: David S. Miller <davem@davemloft.net>
      CC: Greg Thelen <gthelen@google.com>
      CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
      CC: Laurent Chavey <chavey@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f3f511e1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 356b9542
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 770e1b03
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'amba-modalias' of... · d3d0b024
      Linus Torvalds authored
      Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
      
      * 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        sound: aaci: Enable module alias autogeneration for AMBA drivers
        watchdog: sp805: Enable module alias autogeneration for AMBA drivers
        fbdev: amba: Enable module alias autogeneration for AMBA drivers
        serial: pl011: Enable module alias autogeneration for AMBA drivers
        serial: pl010: Enable module alias autogeneration for AMBA drivers
        spi: pl022: Enable module alias autogeneration for AMBA drivers
        rtc: pl031: Enable module alias autogeneration for AMBA drivers
        rtc: pl030: Enable module alias autogeneration for AMBA drivers
        mmc: mmci: Enable module alias autogeneration for AMBA drivers
        input: ambakmi: Enable module alias autogeneration for AMBA drivers
        gpio: pl061: Enable module alias autogeneration for AMBA drivers
        dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
        dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
        hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
        ARM: amba: Auto-generate AMBA driver module aliases during modpost
        ARM: amba: Move definition of struct amba_id to mod_devicetable.h
      d3d0b024
    • Linus Torvalds's avatar
      Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 6ed23fd6
      Linus Torvalds authored
      * 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: gracefully handle NULL pstore_info functions
        pstore: pass reason to backend write callback
      6ed23fd6
    • Linus Torvalds's avatar
      Merge branch 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 5ee354a0
      Linus Torvalds authored
      * 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: pcibr: Use kmemdup rather than duplicating its implementation
        ia64: sn: Use kmemdup rather than duplicating its implementation
        ia64: tioca: Use kmemdup rather than duplicating its implementation
        [IA64] Merge overlapping reserved regions at boot
      5ee354a0
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · c7741713
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (56 commits)
        m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled
        m68k/Kconfig: Separate classic m68k and coldfire early
        m68k: add ColdFire with MMU enabled support to the m68k mem init code
        m68k: do not use m68k startup or interrupt code for ColdFire CPUs
        m68k: add ColdFire FPU support for the V4e ColdFire CPUs
        m68k: adjustments to stack frame for ColdFire with MMU enabled
        m68k: use non-MMU linker script for ColdFire MMU builds
        m68k: ColdFire with MMU enabled uses same clocking code as non-MMU
        m68k: add code to setup a ColdFire 54xx platform when MMU enabled
        m68k: use non-MMU entry.S code when compiling for ColdFire CPU
        m68k: create ColdFire MMU pgalloc code
        m68k: compile appropriate mm arch files for ColdFire MMU support
        m68k: ColdFire V4e MMU paging init code and miss handler
        m68k: use ColdFire MMU read/write bit flags when ioremapping
        m68k: modify cache push and clear code for ColdFire with MMU enable
        m68k: use tracehook_report_syscall_entry/exit for ColdFire MMU ptrace path
        m68k: ColdFire V4e MMU context support code
        m68k: MMU enabled ColdFire needs 8k ELF alignment
        m68k: set ColdFire MMU page size
        m68k: define PAGE_OFFSET_RAW for ColdFire CPU with MMU enabled
        ...
      c7741713
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · e4e88f31
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
        powerpc: fix compile error with 85xx/p1010rdb.c
        powerpc: fix compile error with 85xx/p1023_rds.c
        powerpc/fsl: add MSI support for the Freescale hypervisor
        arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
        powerpc/fsl: Add support for Integrated Flash Controller
        powerpc/fsl: update compatiable on fsl 16550 uart nodes
        powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
        powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
        powerpc/fsl: Update defconfigs to enable some standard FSL HW features
        powerpc: Add TBI PHY node to first MDIO bus
        sbc834x: put full compat string in board match check
        powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
        powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
        offb: Fix setting of the pseudo-palette for >8bpp
        offb: Add palette hack for qemu "standard vga" framebuffer
        offb: Fix bug in calculating requested vram size
        powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
        powerpc/44x: Fix build error on currituck platform
        powerpc/boot: Change the load address for the wrapper to fit the kernel
        powerpc/44x: Enable CRASH_DUMP for 440x
        ...
      
      Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
      the additional sparse-checking code for cputime_t.
      e4e88f31