1. 02 Jan, 2013 7 commits
    • Niels Ole Salscheider's avatar
      brcmsmac: Use udelay instead of usleep_range · 7ffa5928
      Niels Ole Salscheider authored
      wlc_lcnphy_rx_iq_cal_gain is called during initialization, i. e. when
      executing brcms_up.
      But brcms_up is called from brcms_ops_start while the latter holds a spin lock.
      Thus, we cannot use usleep_range but have to use udelay.
      
      This fixes:
      BUG: scheduling while atomic: NetworkManager/1652/0x00000200
      [...]
      Call Trace:
       [<ffffffff81582522>] __schedule_bug+0x48/0x54
       [<ffffffff815892b6>] __schedule+0x596/0x6d0
       [<ffffffff81589719>] schedule+0x29/0x70
       [<ffffffff8158893c>] schedule_hrtimeout_range_clock+0xfc/0x140
       [<ffffffff81060f10>] ? update_rmtp+0x70/0x70
       [<ffffffff81588993>] schedule_hrtimeout_range+0x13/0x20
       [<ffffffff810495e0>] usleep_range+0x40/0x50
       [<ffffffffa05dedcb>] wlc_lcnphy_rx_iq_cal.constprop.10+0x59b/0xa90 [brcmsmac]
       [<ffffffffa05df4ce>] wlc_lcnphy_periodic_cal+0x20e/0x220 [brcmsmac]
       [<ffffffffa05dce8d>] ? wlc_lcnphy_set_tx_pwr_ctrl+0x21d/0x3c0 [brcmsmac]
       [<ffffffffa05e0cfc>] wlc_phy_init_lcnphy+0xacc/0x1100 [brcmsmac]
       [<ffffffffa05e0230>] ? wlc_phy_txpower_recalc_target_lcnphy+0x90/0x90 [brcmsmac]
       [<ffffffffa05d7c7d>] wlc_phy_init+0xcd/0x170 [brcmsmac]
       [<ffffffffa05c9dfe>] brcms_b_bsinit.isra.65+0x12e/0x310 [brcmsmac]
       [<ffffffffa05d061b>] brcms_c_init+0x8fb/0x1170 [brcmsmac]
       [<ffffffffa05c3a0a>] brcms_init+0x5a/0x70 [brcmsmac]
       [<ffffffffa05ce76c>] brcms_c_up+0x1ac/0x4a0 [brcmsmac]
       [<ffffffffa05c3c65>] brcms_up+0x25/0x30 [brcmsmac]
       [<ffffffffa05c44c0>] brcms_ops_start+0xd0/0x100 [brcmsmac]
      [...]
      Signed-off-by: default avatarNiels Ole Salscheider <niels_ole@salscheider-online.de>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      7ffa5928
    • Tomasz Guszkowski's avatar
      p54usb: add USB ID for T-Com Sinus 154 data II · 3194b7fc
      Tomasz Guszkowski authored
      Added USB ID for T-Com Sinus 154 data II.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTomasz Guszkowski <tsg@o2.pl>
      Acked-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      3194b7fc
    • Christian Lamparter's avatar
      carl9170: fix -EINVAL bailout during init with !CONFIG_MAC80211_MESH · 6c653f66
      Christian Lamparter authored
      Sean reported that as of 3.7, his AR9170 device no longer works
      because the driver fails during initialization. He noted this
      is due to:
      "In carl9170/fw.c, ar->hw->wiphy is tagged with
      NL80211_IFTYPE_MESH_POINT support if the firmware has Content
      after Beacon Queuing. This is both in interface_modes and the
      only iface_combinations entry.
      
      If CONFIG_MAC80211_MESH is not set, ieee80211_register_hw
      removes NL80211_IFTYPE_MESH_POINT from interface_modes, but
      not iface_combinations.
      
      wiphy_register then checks to see if every interface type in
      every interface combination is in interface_modes.
      NL80211_IFTYPE_MESH_POINT was removed, so you get a WARN_ON
      warning and it returns -EINVAL, giving up."
      
      Unfortunately, the iface_combination (types) feature bitmap
      in ieee80211_iface_limit is part of a const member in the
      ieee80211_iface_combination struct. Hence, the MESH_POINT
      feature flag can't be masked by wiphy_register in the
      same way as interface_modes in ieee80211_register_hw.
      
      Cc: <stable@vger.kernel.org>
      Reported-by: default avatarSean Patrick Santos <quantheory@gmail.com>
      Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
      Tested-by: default avatarSean Patrick Santos <quantheory@gmail.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      6c653f66
    • Jussi Kivilinna's avatar
      rtlwifi: fix incorrect use of usb_alloc_coherent with usb_control_msg · 4c3de592
      Jussi Kivilinna authored
      Incorrect use of usb_alloc_coherent memory as input buffer to usb_control_msg
      can cause problems in arch DMA code, for example kernel BUG at
      'arch/arm/include/asm/dma-mapping.h:321' on ARM (linux-3.4).
      
      Change _usb_writeN_sync use kmalloc'd buffer instead.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
      Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      4c3de592
    • Sujith Manoharan's avatar
      ath9k: Fix compilation breakage · 12e94327
      Sujith Manoharan authored
      Since ath9k makes use of mac80211's debugfs hooks to
      maintain station statistics, make ATH9K_DEBUGFS
      select MAC80211_DEBUGFS. This fixes the issue reported by
      Fengguang Wu:
      
      drivers/net/wireless/ath/ath9k/debug.c: In function 'ath9k_sta_add_debugfs':
      drivers/net/wireless/ath/ath9k/debug.c:1589:4: error: 'struct ath_node' has no member named 'node_stat'
      drivers/net/wireless/ath/ath9k/debug.c: In function 'ath9k_sta_remove_debugfs':
      drivers/net/wireless/ath/ath9k/debug.c:1599:19: error: 'struct ath_node' has no member named 'node_stat'
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      12e94327
    • Geert Uytterhoeven's avatar
      ssb: SSB_DRIVER_GPIO should depend on GPIOLIB instead of selecting it · 3194f2f0
      Geert Uytterhoeven authored
      Commit ec43b08b ("ssb: add GPIO driver")
      added SSB_DRIVER_GPIO, which unconditionally selects GPIOLIB, causing
      a Kconfig warning:
      
      warning: (ARCH_REQUIRE_GPIOLIB && SSB_DRIVER_GPIO && BCMA_DRIVER_GPIO && MFD_TC6393XB && FB_VIA) selects GPIOLIB which has unmet direct dependencies (ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB)
      
      and build failure for m68k/allmodconfig:
      
      In file included from drivers/ssb/ssb_private.h:5,
                       from drivers/ssb/main.c:12:
      include/linux/ssb/ssb.h:440: error: field ‘gpio’ has incomplete type
      make[4]: *** [drivers/ssb/main.o] Error 1
      make[3]: *** [drivers/ssb/] Error 2
      
      Turn the select into a dependency to fix this.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      3194f2f0
    • Geert Uytterhoeven's avatar
      bcma: BCMA_DRIVER_GPIO should depend on GPIOLIB instead of selecting it · a7333114
      Geert Uytterhoeven authored
      Commit cf0936b0 ("bcma: add GPIO driver")
      added BCMA_DRIVER_GPIO, which unconditionally selects GPIOLIB, causing
      a Kconfig warning:
      
      warning: (ARCH_REQUIRE_GPIOLIB && SSB_DRIVER_GPIO && BCMA_DRIVER_GPIO && MFD_TC6393XB && FB_VIA) selects GPIOLIB which has unmet direct dependencies (ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB)
      
      and build failure for m68k/allmodconfig:
      
      In file included from include/linux/bcma/bcma.h:8,
                       from drivers/bcma/bcma_private.h:9,
                       from drivers/bcma/main.c:9:
      include/linux/bcma/bcma_driver_chipcommon.h:582: error: field ‘gpio’ has incomplete type
      In file included from include/linux/bcma/bcma.h:12,
                       from drivers/bcma/bcma_private.h:9,
                       from drivers/bcma/main.c:9:
      include/linux/ssb/ssb.h:440: error: field ‘gpio’ has incomplete type
      make[4]: *** [drivers/bcma/main.o] Error 1
      make[3]: *** [drivers/bcma/] Error 2
      
      Turn the select into a dependency to fix this.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      a7333114
  2. 22 Dec, 2012 8 commits
    • Linus Torvalds's avatar
      Linux 3.8-rc1 · a49f0d1e
      Linus Torvalds authored
      a49f0d1e
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 4fe19a13
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This includes some fixes and code improvements (like
        clk_prepare_enable and clk_disable_unprepare), conversion from the
        omap_wdt and twl4030_wdt drivers to the watchdog framework, addition
        of the SB8x0 chipset support and the DA9055 Watchdog driver and some
        OF support for the davinci_wdt driver."
      
      * git://www.linux-watchdog.org/linux-watchdog: (22 commits)
        watchdog: mei: avoid oops in watchdog unregister code path
        watchdog: Orion: Fix possible null-deference in orion_wdt_probe
        watchdog: sp5100_tco: Add SB8x0 chipset support
        watchdog: davinci_wdt: add OF support
        watchdog: da9052: Fix invalid free of devm_ allocated data
        watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
        watchdog: remove depends on CONFIG_EXPERIMENTAL
        watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
        watchdog: DA9055 Watchdog driver
        watchdog: omap_wdt: eliminate goto
        watchdog: omap_wdt: delete redundant platform_set_drvdata() calls
        watchdog: omap_wdt: convert to devm_ functions
        watchdog: omap_wdt: convert to new watchdog core
        watchdog: WatchDog Timer Driver Core: fix comment
        watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
        watchdog: imx2_wdt: Select the driver via ARCH_MXC
        watchdog: cpu5wdt.c: add missing del_timer call
        watchdog: hpwdt.c: Increase version string
        watchdog: Convert twl4030_wdt to watchdog core
        davinci_wdt: preparation for switch to common clock framework
        ...
      4fe19a13
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 769cb858
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "Misc small cifs fixes"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: eliminate cifsERROR variable
        cifs: don't compare uniqueids in cifs_prime_dcache unless server inode numbers are in use
        cifs: fix double-free of "string" in cifs_parse_mount_options
      769cb858
    • Linus Torvalds's avatar
      Merge tag 'dm-3.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm · b49249d1
      Linus Torvalds authored
      Pull dm update from Alasdair G Kergon:
       "Miscellaneous device-mapper fixes, cleanups and performance
        improvements.
      
        Of particular note:
         - Disable broken WRITE SAME support in all targets except linear and
           striped.  Use it when kcopyd is zeroing blocks.
         - Remove several mempools from targets by moving the data into the
           bio's new front_pad area(which dm calls 'per_bio_data').
         - Fix a race in thin provisioning if discards are misused.
         - Prevent userspace from interfering with the ioctl parameters and
           use kmalloc for the data buffer if it's small instead of vmalloc.
         - Throttle some annoying error messages when I/O fails."
      
      * tag 'dm-3.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (36 commits)
        dm stripe: add WRITE SAME support
        dm: remove map_info
        dm snapshot: do not use map_context
        dm thin: dont use map_context
        dm raid1: dont use map_context
        dm flakey: dont use map_context
        dm raid1: rename read_record to bio_record
        dm: move target request nr to dm_target_io
        dm snapshot: use per_bio_data
        dm verity: use per_bio_data
        dm raid1: use per_bio_data
        dm: introduce per_bio_data
        dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
        dm linear: add WRITE SAME support
        dm: add WRITE SAME support
        dm: prepare to support WRITE SAME
        dm ioctl: use kmalloc if possible
        dm ioctl: remove PF_MEMALLOC
        dm persistent data: improve improve space map block alloc failure message
        dm thin: use DMERR_LIMIT for errors
        ...
      b49249d1
    • J. Bruce Fields's avatar
      Revert "nfsd: warn on odd reply state in nfsd_vfs_read" · 10532b56
      J. Bruce Fields authored
      This reverts commit 79f77bf9.
      
      This is obviously wrong, and I have no idea how I missed seeing the
      warning in testing: I must just not have looked at the right logs.  The
      caller bumps rq_resused/rq_next_page, so it will always be hit on a
      large enough read.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      10532b56
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 184e2516
      Linus Torvalds authored
      Pull more infiniband changes from Roland Dreier:
       "Second batch of InfiniBand/RDMA changes for 3.8:
         - cxgb4 changes to fix lookup engine hash collisions
         - mlx4 changes to make flow steering usable
         - fix to IPoIB to avoid pinning dst reference for too long"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cxgb4: Fix bug for active and passive LE hash collision path
        RDMA/cxgb4: Fix LE hash collision bug for passive open connection
        RDMA/cxgb4: Fix LE hash collision bug for active open connection
        mlx4_core: Allow choosing flow steering mode
        mlx4_core: Adjustments to Flow Steering activation logic for SR-IOV
        mlx4_core: Fix error flow in the flow steering wrapper
        mlx4_core: Add QPN enforcement for flow steering rules set by VFs
        cxgb4: Add LE hash collision bug fix path in LLD driver
        cxgb4: Add T4 filter support
        IPoIB: Call skb_dst_drop() once skb is enqueued for sending
      184e2516
    • Linus Torvalds's avatar
      Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · 0264405b
      Linus Torvalds authored
      Pull asm-generic cleanup from Arnd Bergmann:
       "These are a few cleanups for asm-generic:
      
         - a set of patches from Lars-Peter Clausen to generalize asm/mmu.h
           and use it in the architectures that don't need any special
           handling.
         - A patch from Will Deacon to remove the {read,write}s{b,w,l} as
           discussed during the arm64 review
         - A patch from James Hogan that helps with the meta architecture
           series."
      
      * tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        xtensa: Use generic asm/mmu.h for nommu
        h8300: Use generic asm/mmu.h
        c6x: Use generic asm/mmu.h
        asm-generic/mmu.h: Add support for FDPIC
        asm-generic/mmu.h: Remove unused vmlist field from mm_context_t
        asm-generic: io: remove {read,write} string functions
        asm-generic/io.h: remove asm/cacheflush.h include
      0264405b
    • Kukjin Kim's avatar
      ARM: dts: fix duplicated build target and alphabetical sort out for exynos · 7e65df38
      Kukjin Kim authored
      Commit db5b0ae0 ("Merge tag 'dt' of git://git.kernel.org/.../arm-soc")
      causes a duplicated build target.  This patch fixes it and sorts out the
      build target alphabetically so that we can recognize something wrong
      easily.
      
      Cc: Olof Johansson <olof@lixom.net>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7e65df38
  3. 21 Dec, 2012 25 commits