1. 11 9月, 2014 6 次提交
    • R
      net: ethernet: arc: Don't free Rockchip resources before disconnect from phy · cf98192d
      Romain Perier 提交于
      Free resources before being disconnected from phy and calling core driver is
      wrong and should not happen. It avoids a delay of 4-5s caused by the timeout of
      phy_disconnect().
      Signed-off-by: NRomain Perier <romain.perier@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cf98192d
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 0aac3833
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      nf-next pull request
      
      The following patchset contains Netfilter/IPVS updates for your
      net-next tree. Regarding nf_tables, most updates focus on consolidating
      the NAT infrastructure and adding support for masquerading. More
      specifically, they are:
      
      1) use __u8 instead of u_int8_t in arptables header, from
         Mike Frysinger.
      
      2) Add support to match by skb->pkttype to the meta expression, from
         Ana Rey.
      
      3) Add support to match by cpu to the meta expression, also from
         Ana Rey.
      
      4) A smatch warning about IPSET_ATTR_MARKMASK validation, patch from
         Vytas Dauksa.
      
      5) Fix netnet and netportnet hash types the range support for IPv4,
         from Sergey Popovich.
      
      6) Fix missing-field-initializer warnings resolved, from Mark Rustad.
      
      7) Dan Carperter reported possible integer overflows in ipset, from
         Jozsef Kadlecsick.
      
      8) Filter out accounting objects in nfacct by type, so you can
         selectively reset quotas, from Alexey Perevalov.
      
      9) Move specific NAT IPv4 functions to the core so x_tables and
         nf_tables can share the same NAT IPv4 engine.
      
      10) Use the new NAT IPv4 functions from nft_chain_nat_ipv4.
      
      11) Move specific NAT IPv6 functions to the core so x_tables and
          nf_tables can share the same NAT IPv4 engine.
      
      12) Use the new NAT IPv6 functions from nft_chain_nat_ipv6.
      
      13) Refactor code to add nft_delrule(), which can be reused in the
          enhancement of the NFT_MSG_DELTABLE to remove a table and its
          content, from Arturo Borrero.
      
      14) Add a helper function to unregister chain hooks, from
          Arturo Borrero.
      
      15) A cleanup to rename to nft_delrule_by_chain for consistency with
          the new nft_*() functions, also from Arturo.
      
      16) Add support to match devgroup to the meta expression, from Ana Rey.
      
      17) Reduce stack usage for IPVS socket option, from Julian Anastasov.
      
      18) Remove unnecessary textsearch state initialization in xt_string,
          from Bojan Prtvar.
      
      19) Add several helper functions to nf_tables, more work to prepare
          the enhancement of NFT_MSG_DELTABLE, again from Arturo Borrero.
      
      20) Enhance NFT_MSG_DELTABLE to delete a table and its content, from
          Arturo Borrero.
      
      21) Support NAT flags in the nat expression to indicate the flavour,
          eg. random fully, from Arturo.
      
      22) Add missing audit code to ebtables when replacing tables, from
          Nicolas Dichtel.
      
      23) Generalize the IPv4 masquerading code to allow its re-use from
          nf_tables, from Arturo.
      
      24) Generalize the IPv6 masquerading code, also from Arturo.
      
      25) Add the new masq expression to support IPv4/IPv6 masquerading
          from nf_tables, also from Arturo.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0aac3833
    • J
      netfilter: Convert pr_warning to pr_warn · b167a37c
      Joe Perches 提交于
      Use the more common pr_warn.
      
      Other miscellanea:
      
      o Coalesce formats
      o Realign arguments
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b167a37c
    • J
      iucv: Convert pr_warning to pr_warn · 47c4cfc3
      Joe Perches 提交于
      Use the more common pr_warn.
      Coalesce formats.
      Realign arguments.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      47c4cfc3
    • J
      pktgen: Convert pr_warning to pr_warn · 294a0b7f
      Joe Perches 提交于
      Use the more common pr_warn.
      Realign arguments.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      294a0b7f
    • J
      atm: Convert pr_warning to pr_warn · ef423a41
      Joe Perches 提交于
      Use the more common pr_warn.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ef423a41
  2. 10 9月, 2014 34 次提交