git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
instruction/clear-actions: string parser/formater, of packet decoder/encoder
[sliver-openvswitch.git]
/
lib
/
stp.c
diff --git
a/lib/stp.c
b/lib/stp.c
index
06ac001
..
3d293b6
100644
(file)
--- a/
lib/stp.c
+++ b/
lib/stp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-151,7
+151,7
@@
stp_next_enabled_port(const struct stp *stp, const struct stp_port *port)
{
for (; port < &stp->ports[ARRAY_SIZE(stp->ports)]; port++) {
if (port->state != STP_DISABLED) {
{
for (; port < &stp->ports[ARRAY_SIZE(stp->ports)]; port++) {
if (port->state != STP_DISABLED) {
- return
(struct stp_port *) port
;
+ return
CONST_CAST(struct stp_port *, port)
;
}
}
return NULL;
}
}
return NULL;
@@
-1371,7
+1371,7
@@
stp_unixctl_tcn(struct unixctl_conn *conn, int argc,
struct stp *stp = stp_find(argv[1]);
if (!stp) {
struct stp *stp = stp_find(argv[1]);
if (!stp) {
- unixctl_command_reply
(conn, 501
, "no such stp object");
+ unixctl_command_reply
_error(conn
, "no such stp object");
return;
}
stp_topology_change_detection(stp);
return;
}
stp_topology_change_detection(stp);
@@
-1383,5
+1383,5
@@
stp_unixctl_tcn(struct unixctl_conn *conn, int argc,
}
}
}
}
- unixctl_command_reply(conn,
200,
"OK");
+ unixctl_command_reply(conn, "OK");
}
}