Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

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

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index fd1b6eb..950e13d 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -97,16 +97,19 @@ struct __fdb_entry
        __u8 port_no;
        __u8 is_local;
        __u32 ageing_timer_value;
-       __u32 unused;
+       __u8 port_hi;
+       __u8 pad0;
+       __u16 unused;
 };
 
 #ifdef __KERNEL__
 
 #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