Merge branch 'linus' into cont_syslog

[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 4ff211d..938b7e8 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -4,8 +4,6 @@
  *     Authors:
  *     Lennert Buytenhek               <buytenh@gnu.org>
  *
- *     $Id: if_bridge.h,v 1.1 2000/02/18 16:47:01 davem Exp $
- *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
  *     as published by the Free Software Foundation; either version
@@ -51,8 +49,7 @@
 #define BR_STATE_FORWARDING 3
 #define BR_STATE_BLOCKING 4
 
-struct __bridge_info
-{
+struct __bridge_info {
        __u64 designated_root;
        __u64 bridge_id;
        __u32 root_path_cost;
@@ -74,8 +71,7 @@ struct __bridge_info
        __u32 gc_timer_value;
 };
 
-struct __port_info
-{
+struct __port_info {
        __u64 designated_root;
        __u64 designated_bridge;
        __u16 port_id;
@@ -91,23 +87,24 @@ struct __port_info
        __u32 hold_timer_value;
 };
 
-struct __fdb_entry
-{
+struct __fdb_entry {
        __u8 mac_addr[6];
        __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 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 **pskb);
+extern int (*br_should_route_hook)(struct sk_buff *skb);
 
 #endif