Merge with Linux 2.4.2.

2 files changed, 52 insertions, 52 deletions

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 8fcfe3fe4..928e89cdb 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -4,7 +4,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_private.h,v 1.4 2001/01/19 04:51:48 davem Exp $
+ *	$Id: br_private.h,v 1.5 2001/02/05 06:03:47 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -116,83 +116,83 @@ extern struct notifier_block br_device_notifier;
 extern unsigned char bridge_ula[6];
 
 /* br.c */
-void br_dec_use_count(void);
-void br_inc_use_count(void);
+extern void br_dec_use_count(void);
+extern void br_inc_use_count(void);
 
 /* br_device.c */
-void br_dev_setup(struct net_device *dev);
+extern void br_dev_setup(struct net_device *dev);
 
 /* br_fdb.c */
-void br_fdb_changeaddr(struct net_bridge_port *p,
+extern void br_fdb_changeaddr(struct net_bridge_port *p,
 		       unsigned char *newaddr);
-void br_fdb_cleanup(struct net_bridge *br);
-void br_fdb_delete_by_port(struct net_bridge *br,
+extern void br_fdb_cleanup(struct net_bridge *br);
+extern void br_fdb_delete_by_port(struct net_bridge *br,
 			   struct net_bridge_port *p);
-struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br,
+extern struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br,
 					unsigned char *addr);
-void br_fdb_put(struct net_bridge_fdb_entry *ent);
-int  br_fdb_get_entries(struct net_bridge *br,
+extern void br_fdb_put(struct net_bridge_fdb_entry *ent);
+extern int  br_fdb_get_entries(struct net_bridge *br,
 			unsigned char *_buf,
 			int maxnum,
 			int offset);
-void br_fdb_insert(struct net_bridge *br,
+extern void br_fdb_insert(struct net_bridge *br,
 		   struct net_bridge_port *source,
 		   unsigned char *addr,
 		   int is_local);
 
 /* br_forward.c */
-void br_forward(struct net_bridge_port *to,
+extern void br_forward(struct net_bridge_port *to,
 		struct sk_buff *skb);
-void br_flood(struct net_bridge *br,
+extern void br_flood(struct net_bridge *br,
 	      struct sk_buff *skb,
 	      int clone);
 
 /* br_if.c */
-int br_add_bridge(char *name);
-int br_del_bridge(char *name);
-int br_add_if(struct net_bridge *br,
+extern int br_add_bridge(char *name);
+extern int br_del_bridge(char *name);
+extern int br_add_if(struct net_bridge *br,
 	      struct net_device *dev);
-int br_del_if(struct net_bridge *br,
+extern int br_del_if(struct net_bridge *br,
 	      struct net_device *dev);
-int br_get_bridge_ifindices(int *indices,
+extern int br_get_bridge_ifindices(int *indices,
 			    int num);
-void br_get_port_ifindices(struct net_bridge *br,
+extern void br_get_port_ifindices(struct net_bridge *br,
 			   int *ifindices);
 
 /* br_input.c */
-void br_handle_frame(struct sk_buff *skb);
+extern void br_handle_frame(struct sk_buff *skb);
 
 /* br_ioctl.c */
-void br_call_ioctl_atomic(void (*fn)(void));
-int br_ioctl(struct net_bridge *br,
+extern void br_call_ioctl_atomic(void (*fn)(void));
+extern int br_ioctl(struct net_bridge *br,
 	     unsigned int cmd,
 	     unsigned long arg0,
 	     unsigned long arg1,
 	     unsigned long arg2);
-int br_ioctl_deviceless_stub(unsigned long arg);
+extern int br_ioctl_deviceless_stub(unsigned long arg);
 
 /* br_stp.c */
-int br_is_root_bridge(struct net_bridge *br);
-struct net_bridge_port *br_get_port(struct net_bridge *br,
+extern int br_is_root_bridge(struct net_bridge *br);
+extern struct net_bridge_port *br_get_port(struct net_bridge *br,
 				    int port_no);
-void br_init_port(struct net_bridge_port *p);
-port_id br_make_port_id(struct net_bridge_port *p);
-void br_become_designated_port(struct net_bridge_port *p);
+extern void br_init_port(struct net_bridge_port *p);
+extern port_id br_make_port_id(struct net_bridge_port *p);
+extern void br_become_designated_port(struct net_bridge_port *p);
 
 /* br_stp_if.c */
-void br_stp_enable_bridge(struct net_bridge *br);
-void br_stp_disable_bridge(struct net_bridge *br);
-void br_stp_enable_port(struct net_bridge_port *p);
-void br_stp_disable_port(struct net_bridge_port *p);
-void br_stp_recalculate_bridge_id(struct net_bridge *br);
-void br_stp_set_bridge_priority(struct net_bridge *br,
+extern void br_stp_enable_bridge(struct net_bridge *br);
+extern void br_stp_disable_bridge(struct net_bridge *br);
+extern void br_stp_enable_port(struct net_bridge_port *p);
+extern void br_stp_disable_port(struct net_bridge_port *p);
+extern void br_stp_recalculate_bridge_id(struct net_bridge *br);
+extern void br_stp_set_bridge_priority(struct net_bridge *br,
 				int newprio);
-void br_stp_set_port_priority(struct net_bridge_port *p,
+extern void br_stp_set_port_priority(struct net_bridge_port *p,
 			      int newprio);
-void br_stp_set_path_cost(struct net_bridge_port *p,
+extern void br_stp_set_path_cost(struct net_bridge_port *p,
 			  int path_cost);
 
 /* br_stp_bpdu.c */
-void br_stp_handle_bpdu(struct sk_buff *skb);
+extern void br_stp_handle_bpdu(struct sk_buff *skb);
 
 #endif
diff --git a/net/bridge/br_private_stp.h b/net/bridge/br_private_stp.h
index 2857d5c91..7aa4af3f5 100644
--- a/net/bridge/br_private_stp.h
+++ b/net/bridge/br_private_stp.h
@@ -4,7 +4,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_private_stp.h,v 1.2 2000/10/30 22:03:20 davem Exp $
+ *	$Id: br_private_stp.h,v 1.3 2001/02/05 06:03:47 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -33,21 +33,21 @@ struct br_config_bpdu
 };
 
 /* br_stp.c */
-void br_become_root_bridge(struct net_bridge *br);
-void br_config_bpdu_generation(struct net_bridge *);
-void br_configuration_update(struct net_bridge *);
-int  br_is_designated_port(struct net_bridge_port *p);
-int  br_is_root_bridge(struct net_bridge *br);
-void br_port_state_selection(struct net_bridge *);
-void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *bpdu);
-void br_received_tcn_bpdu(struct net_bridge_port *p);
-void br_tick(unsigned long __data);
-void br_transmit_config(struct net_bridge_port *p);
-void br_transmit_tcn(struct net_bridge *br);
-void br_topology_change_detection(struct net_bridge *br);
+extern void br_become_root_bridge(struct net_bridge *br);
+extern void br_config_bpdu_generation(struct net_bridge *);
+extern void br_configuration_update(struct net_bridge *);
+extern int  br_is_designated_port(struct net_bridge_port *p);
+extern int  br_is_root_bridge(struct net_bridge *br);
+extern void br_port_state_selection(struct net_bridge *);
+extern void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *bpdu);
+extern void br_received_tcn_bpdu(struct net_bridge_port *p);
+extern void br_tick(unsigned long __data);
+extern void br_transmit_config(struct net_bridge_port *p);
+extern void br_transmit_tcn(struct net_bridge *br);
+extern void br_topology_change_detection(struct net_bridge *br);
 
 /* br_stp_bpdu.c */
-void br_send_config_bpdu(struct net_bridge_port *, struct br_config_bpdu *);
-void br_send_tcn_bpdu(struct net_bridge_port *);
+extern void br_send_config_bpdu(struct net_bridge_port *, struct br_config_bpdu *);
+extern void br_send_tcn_bpdu(struct net_bridge_port *);
 
 #endif