1. 26 Mar, 2014 24 commits
  2. 25 Mar, 2014 16 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
      features."
      
      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."
      
      And...
      
      "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>
      0fc31966
    • 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>
      2c5f4f84
    • Zoltan Kiss's avatar
      Revert "xen-netback: Aggregate TX unmap operations" · 397dfd9f
      Zoltan Kiss authored
      This reverts commit e9275f5e
      
      . This commit is the
      last in the netback grant mapping series, and it tries to do more aggressive
      aggreagtion of unmap operations. However practical use showed almost no
      positive effect, whilst with certain frontends it causes significant performance
      regression.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Acked-by: default avatarIan Campbell <ian.campbell@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      397dfd9f
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/net-next · 8779772c
      David S. Miller authored
      
      
      Eric W. Biederman says:
      
      ====================
      Using dev_kfree/consume_skb_any for functions called in multiple contexts
      
      These changes are a result of walking through the network drivers
      supporting netpoll and verifying the code paths that netpoll can cause
      to be called in hard irq context use an appropriate flavor of
      kfree_skb.  Either dev_kfree_skb_any or dev_consume_skb_any.
      
      Since my last pass at this I have become aware of the small differences
      between dev_kfree_skb_any and dev_consume_skb_any.
      net/core/drop_monitor.c reports the dev_kfree_skb_any as a drop and
      while being quite about the second.  With the weird twist that
      dev_kfree_skb is unintuitively consume_skb.
      
      As netpoll now calls the napi poll function with budget == 0, pieces of
      a drivers the napi poll function that don't run when budget == 0 have
      been ignored.
      
      The most interesting change is to the atl1c which tried unsuccesfully to
      tell one of it's functions which context it is called in so that it
      could call dev_kfree_skb_irq or dev_kfree_skb as appropriate.  I have
      just removed the extra parameter and called dev_consume_skb_any.
      
      At 54 separate changes I will post each change as a separate patch (so
      they can be reviewed) but for general sanity sake I have gathered them
      all into a git branch for easy acces.
      ====================
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8779772c
    • Linus Torvalds's avatar
      Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux · 632b06aa
      Linus Torvalds authored
      Pull nfsd fix frm Bruce Fields:
       "J R Okajima sent this early and I was just slow to pass it along,
        apologies.  Fortunately it's a simple fix"
      
      * 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
        nfsd: fix lost nfserrno() call in nfsd_setattr()
      632b06aa
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 3e79d978
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "These four commits are obvious fixes (a couple of fdget_pos()-related
        ones from Eric Biggers, prepend_name() fix, missing checks for false
        negatives from __lookup_mnt() in fs/namei.c)"
      
      For now I'm pulling just the four obvious fixes, there's another four
      pending in Al's 'for-linus' branch wrt the mnt_hash list that were more
      involved.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        rcuwalk: recheck mount_lock after mountpoint crossing attempts
        make prepend_name() work correctly when called with negative *buflen
        vfs: Don't let __fdget_pos() get FMODE_PATH files
        vfs: atomic f_pos access in llseek()
      3e79d978
    • Eric W. Biederman's avatar
      if_vlan: Call dev_kfree_skb_any instead of kfree_skb. · fb7c03df
      Eric W. Biederman authored
      
      
      Replace kfree_skb with dev_kfree_skb_any in vlan_insert_tag as
      vlan_insert_tag can be called from hard irq context (netpoll)
      and from other contexts.
      
      dev_kfree_skb_any is used as vlan_insert_tag only frees the skb if the
      skb can not be modified to insert a tag, in which case vlan_insert_tag
      drops the skb.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      fb7c03df
    • Eric W. Biederman's avatar
      virtio_net: Call dev_kfree_skb_any instead of dev_kfree_skb. · 85e94525
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_kfree_skb_any in start_xmit which can
      be called in hard irq and other contexts.
      
      start_xmit only frees skbs that it is dropping.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      85e94525
    • Eric W. Biederman's avatar
      staging/octeon-ethernet: Call dev_kfree/consume_skb_any instead of dev_kfree_skb. · 8b6da5fb
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_kfree_skb_any in cvm_oct_xmit_pow which
      can be called in hard irq and other contexts, on the code paths that
      drop packets.
      
      Replace dev_kfree_skb with dev_consume_skb_any in cvm_oct_xmit_pow which
      can be called in hard irq and other contexts, on the code path where
      the packet is transmitted successfully.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      8b6da5fb
    • Eric W. Biederman's avatar
      wlags49_h2: Call dev_kfree/consume_skb_any instead of dev_kfree_skb. · 8d4ade28
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_consume_skb_any in wl_send and
      wl_send_dma which can be called in hard irq and other contexts,
      on the code paths where the skb was transmitted successfully.
      
      Replace dev_kfree_skb with dev_kfree_skb_any in wl_send_dmay which can
      be called in hard irq and other contexts, on the code path where a
      skb is dropped.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      8d4ade28
    • Eric W. Biederman's avatar
      xen-netfront: Call dev_kfree_skb_any instead of dev_kfree_skb. · 979de8a0
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_kfree_skb_any in xennet_start_xmit
      which can be called in hard irq and other contexts.  xennet_start_xmit
      only fress skbs which it drops.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      979de8a0
    • Eric W. Biederman's avatar
      vmxnet3: Call dev_kfree_skb_any instead of dev_kfree_skb. · b1b71817
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_kfree_skb_any in vmnet3_tx_xmit which
      can be called in hard irq and other contexts.  vmnet3_tx_xmit only
      frees skbs that it has dropped.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      b1b71817
    • Eric W. Biederman's avatar
      xilinx_emaclite: Call dev_consume_skb_any instead of dev_kfree_skb. · 69e73d23
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_consume_skb_any in xemaclite_send which
      can be called in hard irq and other contexts.  xemacelite_send only
      frees skbs that it has successfully transmitted.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      69e73d23
    • Eric W. Biederman's avatar
      via-velocity: Call dev_kfree_skb_any instead of kfree_skb. · 001eadf6
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_kfree_skb_any in velocity_xmit that can
      be called in hard irq and other contexts.  Packets are freed and
      dropped in velocity_xmit when they are too fragmented and can
      not be linearized.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      001eadf6
    • Eric W. Biederman's avatar
      via-rhine: Call dev_kfree/consume_skb_any instead of dev_kfree_skb. · 4b3afc6e
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_kfree_skb_any in rhine_start_tx which
      can be called in hard irq and other contexts.  Packets are only freed
      in rhine_start_tx if they are dropped.
      
      Replace dev_kfree_skb with dev_consume_skb_any in rhine_tx that can be
      called in hard irq and other contexts.  rhine_tx handles successfully
      transmitted packets.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      4b3afc6e
    • Eric W. Biederman's avatar
      spider_net: Call dev_consume_skb_any instead of dev_kfree_skb. · 20eca054
      Eric W. Biederman authored
      
      
      Replace dev_kfree_skb with dev_consume_skb_any in
      spider_net_release_tx_chain which can be called in hard irq and other
      contexts.
      
      dev_consume_skb_any was choosen as it preserves the current
      dev_kfree_skb semantics (dev_kfree_skb is consume_skb) and
      is because it is correct most of the time as most packets
      will have been successfully transmitted not dropeed.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      20eca054