1. 10 Jan, 2014 7 commits
    • John W. Linville's avatar
      Merge branch 'master' of... · 235f9392
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      
      Conflicts:
      	net/ieee802154/6lowpan.c
      235f9392
    • Paul Durrant's avatar
      xen-netback: stop vif thread spinning if frontend is unresponsive · 11b57f90
      Paul Durrant authored
      The recent patch to improve guest receive side flow control (ca2f09f2) had a
      slight flaw in the wait condition for the vif thread in that any remaining
      skbs in the guest receive side netback internal queue would prevent the
      thread from sleeping. An unresponsive frontend can lead to a permanently
      non-empty internal queue and thus the thread will spin. In this case the
      thread should really sleep until the frontend becomes responsive again.
      
      This patch adds an extra flag to the vif which is set if the shared ring
      is full and cleared when skbs are drained into the shared ring. Thus,
      if the thread runs, finds the shared ring full and can make no progress the
      flag remains set. If the flag remains set then the thread will sleep,
      regardless of a non-empty queue, until the next event from the frontend.
      Signed-off-by: default avatarPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Acked-by: default avatarWei Liu <wei.liu2@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11b57f90
    • Hariprasad Shenai's avatar
    • Kuninori Morimoto's avatar
      irda: sh_sir: use devm_request_irq() · 4acb4d6c
      Kuninori Morimoto authored
      Huqiu reported current sh_sir driver doesn't
      call free_irq() in spite of using request_irq().
      This patch replaces request_irq() into devm_request_irq()
      to solve this issue
      
      Reported-by: Huqiu Liu<huqiuliu@gmail.com>
      Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4acb4d6c
    • Kuninori Morimoto's avatar
      irda: sh_irda: use devm_request_irq() · 033b06eb
      Kuninori Morimoto authored
      Huqiu reported current sh_irda driver doesn't
      call free_irq() in spite of using request_irq().
      This patch replaces request_irq() into devm_request_irq()
      to solve this issue
      
      Reported-by: Huqiu Liu<huqiuliu@gmail.com>
      Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      033b06eb
    • Kuninori Morimoto's avatar
      irda: fixup SH_SIR position on Kconfig · 90e8c72e
      Kuninori Morimoto authored
      SH_SIR is not Dongle
      Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      90e8c72e
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables · 751fcac1
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      nf_tables updates for net-next
      
      The following patchset contains the following nf_tables updates,
      mostly updates from Patrick McHardy, they are:
      
      * Add the "inet" table and filter chain type for this new netfilter
        family: NFPROTO_INET. This special table/chain allows IPv4 and IPv6
        rules, this should help to simplify the burden in the administration
        of dual stack firewalls. This also includes several patches to prepare
        the infrastructure for this new table and a new meta extension to
        match the layer 3 and 4 protocol numbers, from Patrick McHardy.
      
      * Load both IPv4 and IPv6 conntrack modules in nft_ct if the rule is used
        in NFPROTO_INET, as we don't certainly know which one would be used,
        also from Patrick McHardy.
      
      * Do not allow to delete a table that contains sets, otherwise these
        sets become orphan, from Patrick McHardy.
      
      * Hold a reference to the corresponding nf_tables family module when
        creating a table of that family type, to avoid the module deletion
        when in use, from Patrick McHardy.
      
      * Update chain counters before setting the chain policy to ensure that
        we don't leave the chain in inconsistent state in case of errors (aka.
        restore chain atomicity). This also fixes a possible leak if it fails
        to allocate the chain counters if no counters are passed to be restored,
        from Patrick McHardy.
      
      * Don't check for overflows in the table counter if we are just renaming
        a chain, from Patrick McHardy.
      
      * Replay the netlink request after dropping the nfnl lock to load the
        module that supports provides a chain type, from Patrick.
      
      * Fix chain type module references, from Patrick.
      
      * Several cleanups, function renames, constification and code
        refactorizations also from Patrick McHardy.
      
      * Add support to set the connmark, this can be used to set it based on
        the meta mark (similar feature to -j CONNMARK --restore), from
        Kristian Evensen.
      
      * A couple of fixes to the recently added meta/set support and nft_reject,
        and fix missing chain type unregistration if we fail to register our
        the family table/filter chain type, from myself.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      751fcac1
  2. 09 Jan, 2014 33 commits