1. 09 5月, 2013 2 次提交
    • S
      iwl4965: workaround connection regression on passive channel · dd9c4640
      Stanislaw Gruszka 提交于
      Jake reported that since commit 1672c0e3
      "mac80211: start auth/assoc timeout on frame status", he is unable to
      connect to his AP, which is configured to use passive channel.
      
      After switch to passive channel 4965 firmware drops any TX packet until
      it receives beacon. Before commit 1672c0e3 we waited on channel and
      retransmit packet after 200ms, that makes we receive beacon on the
      meantime and association process succeed. New mac80211 behaviour cause
      that any ASSOC frame fail immediately on iwl4965 and we can not
      associate.
      
      This patch restore old mac80211 behaviour for iwl4965, by removing
      IEEE80211_HW_REPORTS_TX_ACK_STATUS feature. This feature will be
      added again to iwl4965 driver, when different, more complex
      workaround for this firmware issue, will be added to the driver.
      
      Cc: stable@vger.kernel.org # 3.9
      Bisected-by: NJake Edge <jake@lwn.net>
      Reported-and-tested-by: NJake Edge <jake@lwn.net>
      Signed-off-by: NStanislaw Gruszka <sgruszka@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      dd9c4640
    • T
      B43: Handle DMA RX descriptor underrun · 73b82bf0
      Thommy Jakobsson 提交于
      Add handling of rx descriptor underflow. This fixes a fault that could
      happen on slow machines, where data is received faster than the CPU can
      handle. In such a case the device will use up all rx descriptors and
      refuse to send any more data before confirming that it is ok. This
      patch enables necessary interrupt to discover such a situation and will
      handle them by dropping everything in the ring buffer.
      Reviewed-by: NMichael Buesch <m@bues.ch>
      Signed-off-by: NThommy Jakobsson <thommyj@gmail.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      73b82bf0
  2. 04 5月, 2013 2 次提交
  3. 30 4月, 2013 1 次提交
    • J
      Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · a8a48e60
      John W. Linville 提交于
      Samuel Ortiz <sameo@linux.intel.com> says:
      
      "With this one we have:
      
      - One patch for moving the LLCP code into net/nfc.
        It fixes a build annoyance reported by Dave Miller caused by the fact
        that the LLCP code object targets are not in the same directory as the
        Makefile trying to build them is. It prevents us from doing e.g.
      
              make net/nfc/llcp/sock.o
      
        Moving the LLCP code into net/nfc and not making it optional anymore
        makes sense as LLCP is a fundamental piece of the NFC specifications
        and thus should be in the core NFC directory.
      
      - One patch that fixes the missing dependency against RFKILL. Without it NFC
        fails to properly build when it's builtin and CONFIG_RFKILL=m."
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      a8a48e60
  4. 27 4月, 2013 1 次提交
    • M
      NFC: Add missing RFKILL dependency for Kconfig · c204ea09
      Marcel Holtmann 提交于
      Since the NFC subsystem gained RFKILL support, it needs to be able
      to build properly with whatever option for RFKILL has been selected.
      
      on i386:
      
      net/built-in.o: In function `nfc_unregister_device':
      (.text+0x6a36d): undefined reference to `rfkill_unregister'
      net/built-in.o: In function `nfc_unregister_device':
      (.text+0x6a378): undefined reference to `rfkill_destroy'
      net/built-in.o: In function `nfc_register_device':
      (.text+0x6a493): undefined reference to `rfkill_alloc'
      net/built-in.o: In function `nfc_register_device':
      (.text+0x6a4a4): undefined reference to `rfkill_register'
      net/built-in.o: In function `nfc_register_device':
      (.text+0x6a4b3): undefined reference to `rfkill_destroy'
      net/built-in.o: In function `nfc_dev_up':
      (.text+0x6a8e8): undefined reference to `rfkill_blocked'
      
      when CONFIG_RFKILL=m but NFC is builtin.
      Reported-by: NRandy Dunlap <rdunlap@infradead.org>
      Acked-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
      c204ea09
  5. 26 4月, 2013 10 次提交
  6. 24 4月, 2013 24 次提交