X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Flinux%2Fif_bridge.h;h=950e13d09e06c04e2ce5d44873affa8a98075287;hb=4f46accee45d74a408e417c04c0ed1543a7c51e9;hp=fd1b6eb94a5f1241a6d27f173892d47ac4628c91;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index fd1b6eb..950e13d 100644
--- 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