Re: [PATCH 09/15] br_netfilter: pernet_operations brnf_net_ops without per-netns sysctl registration

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Vasily Averin schreef op 9/05/2014 23:28:
pernet_operations was added,
rollback in br_netfilter_init was reworked

Signed-off-by: Vasily Averin <vvs@xxxxxxxxxx>
---
  net/bridge/br_netfilter.c |   60 ++++++++++++++++++++++++++++++++++++++------
  1 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index e3ab72f8..460917c 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -35,6 +35,7 @@
  #include <net/ip.h>
  #include <net/ipv6.h>
  #include <net/route.h>
+#include <net/netns/generic.h>

  #include <asm/uaccess.h>
  #include "br_private.h"
@@ -47,6 +48,7 @@
  #define store_orig_dstaddr(skb)	 (skb_origaddr(skb) = ip_hdr(skb)->daddr)
  #define dnat_took_place(skb)	 (skb_origaddr(skb) != ip_hdr(skb)->daddr)

+int brnf_net_id __read_mostly;

Should be static.

cheers,
Bart

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Netfitler Users]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux