Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c28d05 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of git://dev.medozas.de/linux

parents d0b0268f e3eaa991

include/linux/netfilter/x_tables.h

+4 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ struct xt_table { 
	struct module *me;



	u_int8_t af;		/* address/protocol family */

	int priority;		/* hook order */



	/* A unique name... */

	const char name[XT_TABLE_MAXNAMELEN];
@@ -521,6 +522,9 @@ static inline unsigned long ifname_compare_aligned(const char *_a, 
	return ret;

}



extern struct nf_hook_ops *xt_hook_link(const struct xt_table *, nf_hookfn *);

extern void xt_hook_unlink(const struct xt_table *, struct nf_hook_ops *);



#ifdef CONFIG_COMPAT

#include <net/compat.h>

include/linux/netfilter_arp/arp_tables.h

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ struct arpt_error { 
	.target.errorname = "ERROR",					       \

}



extern void *arpt_alloc_initial_table(const struct xt_table *);

extern struct xt_table *arpt_register_table(struct net *net,

					    const struct xt_table *table,

					    const struct arpt_replace *repl);

include/linux/netfilter_ipv4/ip_tables.h

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ struct ipt_error { 
	.target.errorname = "ERROR",					       \

}



extern void *ipt_alloc_initial_table(const struct xt_table *);

extern unsigned int ipt_do_table(struct sk_buff *skb,

				 unsigned int hook,

				 const struct net_device *in,

include/linux/netfilter_ipv6/ip6_tables.h

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ ip6t_get_target(struct ip6t_entry *e) 
#include <linux/init.h>

extern void ip6t_init(void) __init;



extern void *ip6t_alloc_initial_table(const struct xt_table *);

extern struct xt_table *ip6t_register_table(struct net *net,

					    const struct xt_table *table,

					    const struct ip6t_replace *repl);

net/ipv4/netfilter/arp_tables.c

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <linux/netfilter/x_tables.h>

#include <linux/netfilter_arp/arp_tables.h>

#include "../../netfilter/xt_repldata.h"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
@@ -58,6 +59,12 @@ do { \ 
#define ARP_NF_ASSERT(x)

#endif



void *arpt_alloc_initial_table(const struct xt_table *info)

{

	return xt_alloc_initial_table(arpt, ARPT);

}

EXPORT_SYMBOL_GPL(arpt_alloc_initial_table);



static inline int arp_devaddr_compare(const struct arpt_devaddr_info *ap,

				      const char *hdr_addr, int len)

{