1. 26 Mar, 2014 38 commits
  2. 25 Mar, 2014 2 commits
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 0fc31966
      David S. Miller authored
      John W. Linville says:
      Please pull this batch of wireless updates intended for 3.15!
      For the mac80211 bits, Johannes says:
      "This has a whole bunch of bugfixes for things that went into -next
      previously as well as some other bugfixes I didn't want to rush into
      3.14 at this point. The rest of it is some cleanups and a few small
      features, the biggest of which is probably Janusz's regulatory DFS CAC
      time code."
      For the Bluetooth bits, Gustavo says:
      "One more pull request to 3.15. This is mostly and bug fix pull request, it
      contains several fixes and clean up all over the tree, plus some small new
      For the NFC bits, Samuel says:
      "This is the NFC pull request for 3.15. With this one we have:
      - Support for ISO 15693 a.k.a. NFC vicinity a.k.a. Type 5 tags. ISO
        15693 are long range (1 - 2 meters) vicinity tags/cards. The kernel
        now supports those through the NFC netlink and digital APIs.
      - Support for TI's trf7970a chipset. This chipset relies on the NFC
        digital layer and the driver currently supports type 2, 4A and 5 tags.
      - Support for NXP's pn544 secure firmare download. The pn544 C3 chipsets
        relies on a different firmware download protocal than the C2 one. We
        now support both and use the right one depending on the version we
        detect at runtime.
      - Support for 4A tags from the NFC digital layer.
      - A bunch of cleanups and minor fixes from Axel Lin and Thierry Escande."
      For the iwlwifi bits, Emmanuel says:
      "We were sending a host command while the mutex wasn't held. This
      led to hard-to-catch races."
      "I have a fix for a "merge damage" which is not really a merge
      damage: it enables scheduled scan which has been disabled in
      wireless.git. Since you merged wireless.git into wireless-next.git,
      this can now be fixed in wireless-next.git.
      Besides this, Alex made a workaround for a hardware bug. This fix
      allows us to consume less power in S3. Arik and Eliad continue to
      work on D0i3 which is a run-time power saving feature. Eliad also
      contributes a few bits to the rate scaling logic to which Eyal adds his
      own contribution. Avri dives deep in the power code - newer firmware
      will allow to enable power save in newer scenarios. Johannes made a few
      clean-ups. I have the regular amount of BT Coex boring stuff. I disable
      uAPSD since we identified firmware bugs that cause packet loss. One
      thing that do stand out is the udev event that we now send when the
      FW asserts. I hope it will allow us to debug the FW more easily."
      Also included is one last iwlwifi pull for a build breakage fix...
      For the Atheros bits, Kalle says:
      "Michal now did some optimisations and was able to improve throughput by
      100 Mbps on our MIPS based AP135 platform. Chun-Yeow added some
      workarounds to be able to better use ad-hoc mode. Ben improved log
      messages and added support for MSDU chaining. And, as usual, also some
      smaller fixes."
      Beyond that...
      Andrea Merello continues his rtl8180 refactoring, in preparation for
      a long-awaited rtl8187 driver.  We get a new driver (rsi) for the
      RS9113 chip, from Fariya Fatima.  And, of course, we get the usual
      round of updates for ath9k, brcmfmac, mwifiex, wil6210, etc. as well.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      xen-netback: Proper printf format for ptrdiff_t is 't'. · 2c5f4f84
      David S. Miller authored
      This fixes:
      drivers/net/xen-netback/netback.c: In function ‘xenvif_tx_dealloc_action’:
      drivers/net/xen-netback/netback.c:1573:8: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘long int’ [-Wformat=]
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>