1. 23 6月, 2015 19 次提交
  2. 22 6月, 2015 19 次提交
  3. 21 6月, 2015 1 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 12011962
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains a final Netfilter pull request for net-next
      4.2. This mostly addresses some fallout from the previous pull request, small
      netns updates and a couple of new features for nfnetlink_log and the socket
      match that didn't get in time for the previous pull request. More specifically
      they are:
      
      1) Add security context information to nfnetlink_queue, from Roman Kubiak.
      
      2) Add support to restore the sk_mark into skb->mark through xt_socket,
         from Harout Hedeshian.
      
      3) Force alignment of 16 bytes of per cpu xt_counters, from Eric Dumazet.
      
      4) Rename br_netfilter.c to br_netfilter_hooks.c to prepare split of IPv6 code
         into a separated file.
      
      5) Move the IPv6 code in br_netfilter into a separated file.
      
      6) Remove unused RCV_SKB_FAIL() in nfnetlink_queue and nfetlink_log, from Eric
         Biederman.
      
      7) Two liner to simplify netns logic in em_ipset_match().
      
      8) Add missing includes to net/net_namespace.h to avoid compilation problems
         that result from not including linux/netfilter.h in netns headers.
      
      9) Use a forward declaration instead of including linux/proc_fs.h from
         netns/netfilter.h
      
      10) Add a new linux/netfilter_defs.h to replace the linux/netfilter.h inclusion
          in netns headers.
      
      11) Remove spurious netfilter.h file included in the net tree, also from Eric
          Biederman.
      
      12) Fix x_tables compilation warnings on 32 bits platforms that resulted from
          recent changes in x_tables counters, from Florian Westphal.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      12011962
  4. 19 6月, 2015 1 次提交
    • F
      netfilter: xtables: fix warnings on 32bit platforms · dcb8f5c8
      Florian Westphal 提交于
      On 32bit archs gcc complains due to cast from void* to u64.
      Add intermediate casts to long to silence these warnings.
      
      include/linux/netfilter/x_tables.h:376:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
      include/linux/netfilter/x_tables.h:384:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
      include/linux/netfilter/x_tables.h:391:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
      include/linux/netfilter/x_tables.h:400:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
      
      Fixes: 71ae0dff ("netfilter: xtables: use percpu rule counters")
      Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      dcb8f5c8