Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[linux-2.6] / include / linux / if_bridge.h

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index fd1b6eb94a5f1241a6d27f173892d47ac4628c91..58e43e5664575f25e7249a6e4c4301ee0a036ce4 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -104,9 +104,10 @@ struct __fdb_entry
 
 #include <linux/netdevice.h>
 
-extern void brioctl_set(int (*ioctl_hook)(unsigned int, void __user *));
-extern int (*br_handle_frame_hook)(struct net_bridge_port *p, struct sk_buff **pskb);
-extern int (*br_should_route_hook)(struct sk_buff **pskb);
+extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
+extern struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p,
+                                              struct sk_buff *skb);
+extern int (*br_should_route_hook)(struct sk_buff *skb);
 
 #endif