projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] 3378/1: ixp2000: fix gpio interrupt handling
[powerpc.git]
/
net
/
bridge
/
br_private.h
diff --git
a/net/bridge/br_private.h
b/net/bridge/br_private.h
index
8f10e09
..
86ecea7
100644
(file)
--- a/
net/bridge/br_private.h
+++ b/
net/bridge/br_private.h
@@
-109,6
+109,7
@@
struct net_bridge
unsigned long bridge_hello_time;
unsigned long bridge_forward_delay;
unsigned long bridge_hello_time;
unsigned long bridge_forward_delay;
+ u8 group_addr[ETH_ALEN];
u16 root_port;
unsigned char stp_enabled;
unsigned char topology_change;
u16 root_port;
unsigned char stp_enabled;
unsigned char topology_change;
@@
-122,7
+123,7
@@
struct net_bridge
};
extern struct notifier_block br_device_notifier;
};
extern struct notifier_block br_device_notifier;
-extern const u
nsigned char bridge_ula[6
];
+extern const u
8 br_group_address[ETH_ALEN
];
/* called under bridge lock */
static inline int br_is_root_bridge(const struct net_bridge *br)
/* called under bridge lock */
static inline int br_is_root_bridge(const struct net_bridge *br)
@@
-217,7
+218,8
@@
extern void br_stp_set_path_cost(struct net_bridge_port *p,
extern ssize_t br_show_bridge_id(char *buf, const struct bridge_id *id);
/* br_stp_bpdu.c */
extern ssize_t br_show_bridge_id(char *buf, const struct bridge_id *id);
/* br_stp_bpdu.c */
-extern int br_stp_handle_bpdu(struct sk_buff *skb);
+extern int br_stp_rcv(struct sk_buff *skb, struct net_device *dev,
+ struct packet_type *pt, struct net_device *orig_dev);
/* br_stp_timer.c */
extern void br_stp_timer_init(struct net_bridge *br);
/* br_stp_timer.c */
extern void br_stp_timer_init(struct net_bridge *br);