Remove unused function parameter from stp_received_tcn_bpdu().
authorBen Pfaff <blp@nicira.com>
Thu, 8 Jan 2009 23:23:29 +0000 (15:23 -0800)
committerBen Pfaff <blp@nicira.com>
Thu, 8 Jan 2009 23:23:29 +0000 (15:23 -0800)
Found with -Wunused-parameter.

lib/stp.c
secchan/secchan.c

index fa9dd010a8e57f2e1901ea3bc59261823cc72419..b6383111eac6f1dccb9809dc4b3ea5f923b776fb 100644 (file)
--- a/lib/stp.c
+++ b/lib/stp.c
@@ -190,8 +190,7 @@ static void stp_topology_change_acknowledged(struct stp *);
 static void stp_acknowledge_topology_change(struct stp_port *);
 static void stp_received_config_bpdu(struct stp *, struct stp_port *,
                                      const struct stp_config_bpdu *);
-static void stp_received_tcn_bpdu(struct stp *, struct stp_port *,
-                                  const struct stp_tcn_bpdu *);
+static void stp_received_tcn_bpdu(struct stp *, struct stp_port *);
 static void stp_hello_timer_expiry(struct stp *);
 static void stp_message_age_timer_expiry(struct stp_port *);
 static bool stp_is_designated_for_some_port(const struct stp *);
@@ -585,7 +584,7 @@ stp_received_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
                       stp->name, bpdu_size);
             return;
         }
-        stp_received_tcn_bpdu(stp, p, bpdu);
+        stp_received_tcn_bpdu(stp, p);
         break;
 
     default:
@@ -1028,8 +1027,7 @@ stp_received_config_bpdu(struct stp *stp, struct stp_port *p,
 }
 
 void
-stp_received_tcn_bpdu(struct stp *stp, struct stp_port *p,
-                      const struct stp_tcn_bpdu *tcn)
+stp_received_tcn_bpdu(struct stp *stp, struct stp_port *p)
 {
     if (p->state != STP_DISABLED) {
         if (stp_is_designated_port(p)) {
index 05a42514b296ece170c2fdf0d03c66d6f6d3b824..04c5d9d61ddbeebdeec9797834100c40ac5980d2 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+/* Copyright (c) 2008, 2009 The Board of Trustees of The Leland Stanford
  * Junior University
  *
  * We are making the OpenFlow specification and associated documentation
@@ -215,7 +215,7 @@ main(int argc, char *argv[])
 #endif
     flow_end_start(&secchan, s.netflow_dst, local_rconn, remote_rconn);
     if (s.enable_stp) {
-        stp_start(&secchan, &s, pw, local_rconn, remote_rconn);
+        stp_start(&secchan, pw, local_rconn, remote_rconn);
     }
     if (s.in_band) {
         in_band_start(&secchan, &s, switch_status, pw, remote_rconn);