summaryrefslogtreecommitdiffstats
path: root/net/bridge/netfilter
diff options
context:
space:
mode:
authorEric Dumazet2010-11-15 07:38:11 +0100
committerDavid S. Miller2010-11-15 20:13:16 +0100
commita386f99025f13b32502fe5dedf223c20d7283826 (patch)
tree63f137ee76576555118ae0ff6a49ee6f0412aa11 /net/bridge/netfilter
parentbridge: add RCU annotation to bridge multicast table (diff)
downloadkernel-qcow2-linux-a386f99025f13b32502fe5dedf223c20d7283826.tar.gz
kernel-qcow2-linux-a386f99025f13b32502fe5dedf223c20d7283826.tar.xz
kernel-qcow2-linux-a386f99025f13b32502fe5dedf223c20d7283826.zip
bridge: add proper RCU annotation to should_route_hook
Add br_should_route_hook_t typedef, this is the only way we can get a clean RCU implementation for function pointer. Move route_hook to location where it is used. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/netfilter')
-rw-r--r--net/bridge/netfilter/ebtable_broute.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index ae3f106c3908..1bcaf36ad612 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -87,7 +87,8 @@ static int __init ebtable_broute_init(void)
if (ret < 0)
return ret;
/* see br_input.c */
- rcu_assign_pointer(br_should_route_hook, ebt_broute);
+ rcu_assign_pointer(br_should_route_hook,
+ (br_should_route_hook_t *)ebt_broute);
return 0;
}