aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_multicast.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-03-22 23:07:21 -0400
committerJan Engelhardt <jengelh@medozas.de>2010-03-25 11:00:29 -0400
commit713aefa3fb3929ce36305d4d1b7b4059d87ed115 (patch)
treed73b898fa5920b434bffd60dce669c48758a2b5d /net/bridge/br_multicast.c
parent5dc7a6d5749d3ddbf9fbea9512cb45762428512c (diff)
netfilter: bridge: use NFPROTO values for NF_HOOK invocation
The first argument to NF_HOOK* is an nfproto since quite some time. Commit v2.6.27-2457-gfdc9314 was the first to practically start using the new names. Do that now for the remaining NF_HOOK calls. The semantic patch used was: // <smpl> @@ @@ (NF_HOOK |NF_HOOK_THRESH )( -PF_BRIDGE, +NFPROTO_BRIDGE, ...) @@ @@ NF_HOOK( -PF_INET6, +NFPROTO_IPV6, ...) @@ @@ NF_HOOK( -PF_INET, +NFPROTO_IPV4, ...) // </smpl> Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/bridge/br_multicast.c')
-rw-r--r--net/bridge/br_multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 6980625537ca..ed19b0a730ab 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -608,7 +608,7 @@ static void br_multicast_send_query(struct net_bridge *br,
608 if (port) { 608 if (port) {
609 __skb_push(skb, sizeof(struct ethhdr)); 609 __skb_push(skb, sizeof(struct ethhdr));
610 skb->dev = port->dev; 610 skb->dev = port->dev;
611 NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, 611 NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
612 dev_queue_xmit); 612 dev_queue_xmit);
613 } else 613 } else
614 netif_rx(skb); 614 netif_rx(skb);