All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arptable_filter: merge forward hook
@ 2008-10-28 20:54 Alexey Dobriyan
  2008-10-29  8:51 ` Patrick McHardy
  0 siblings, 1 reply; 2+ messages in thread
From: Alexey Dobriyan @ 2008-10-28 20:54 UTC (permalink / raw)
  To: kaber; +Cc: netfilter, containters

It's identical to NF_ARP_IN hook.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 net/ipv4/netfilter/arptable_filter.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

--- a/net/ipv4/netfilter/arptable_filter.c
+++ b/net/ipv4/netfilter/arptable_filter.c
@@ -75,16 +75,6 @@ static unsigned int arpt_out_hook(unsigned int hook,
 			     dev_net(out)->ipv4.arptable_filter);
 }
 
-static unsigned int arpt_forward_hook(unsigned int hook,
-				      struct sk_buff *skb,
-				      const struct net_device *in,
-				      const struct net_device *out,
-				      int (*okfn)(struct sk_buff *))
-{
-	return arpt_do_table(skb, hook, in, out,
-			     dev_net(in)->ipv4.arptable_filter);
-}
-
 static struct nf_hook_ops arpt_ops[] __read_mostly = {
 	{
 		.hook		= arpt_in_hook,
@@ -101,7 +91,7 @@ static struct nf_hook_ops arpt_ops[] __read_mostly = {
 		.priority	= NF_IP_PRI_FILTER,
 	},
 	{
-		.hook		= arpt_forward_hook,
+		.hook		= arpt_in_hook,
 		.owner		= THIS_MODULE,
 		.pf		= NFPROTO_ARP,
 		.hooknum	= NF_ARP_FORWARD,

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] arptable_filter: merge forward hook
  2008-10-28 20:54 [PATCH] arptable_filter: merge forward hook Alexey Dobriyan
@ 2008-10-29  8:51 ` Patrick McHardy
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2008-10-29  8:51 UTC (permalink / raw)
  To: Alexey Dobriyan; +Cc: netfilter, containters

Alexey Dobriyan wrote:
> It's identical to NF_ARP_IN hook.

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-10-29  8:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-28 20:54 [PATCH] arptable_filter: merge forward hook Alexey Dobriyan
2008-10-29  8:51 ` Patrick McHardy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.