Merge remote-tracking branch 'upstream/master'

[people/ms/rstp.git] / bridge_ctl.h

diff --git a/bridge_ctl.h b/bridge_ctl.h
index bcb975445373a7476aa531f1af17536e7aa4f769..b0449ca0487d4e8b4562e962e48456152da26f31 100644 (file)
--- a/bridge_ctl.h
+++ b/bridge_ctl.h
@@ -33,11 +33,9 @@ void bridge_get_configuration(void);
 
 int bridge_set_state(int ifindex, int state);
 
-int bridge_send_bpdu(int ifindex, const unsigned char *data, int len);
+int bridge_notify(int br_index, int if_index, int newlink, unsigned flags);
 
-int bridge_notify(int br_index, int if_index, int newlink, int up);
-
-void bridge_bpdu_rcv(struct ifdata *, const unsigned char *data, int len);
+void bridge_bpdu_rcv(int ifindex, const unsigned char *data, int len);
 
 void bridge_one_second(void);