[ovs-dev] [port reconf 1/7] vswitchd: Push ofproto_port declaration down to inner blocks.
Ben Pfaff
blp at nicira.com
Wed Apr 25 00:06:31 UTC 2012
Just a tiny code cleanup.
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
vswitchd/bridge.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 833973a..0039708 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1236,7 +1236,6 @@ bridge_refresh_ofp_port(struct bridge *br)
static void
iface_create(struct bridge *br, struct if_cfg *if_cfg, int ofp_port)
{
- struct ofproto_port ofproto_port;
struct iface *iface;
struct port *port;
int error;
@@ -1326,6 +1325,8 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, int ofp_port)
VLOG_DBG("bridge %s: interface %s is on port %d",
br->name, iface->name, iface->ofp_port);
} else {
+ struct ofproto_port ofproto_port;
+
if (iface->netdev) {
VLOG_ERR("bridge %s: missing %s interface, dropping",
br->name, iface->name);
@@ -1351,6 +1352,8 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, int ofp_port)
/* Add bond fake iface if necessary. */
if (port_is_bond_fake_iface(port)) {
+ struct ofproto_port ofproto_port;
+
if (ofproto_port_query_by_name(br->ofproto, port->name,
&ofproto_port)) {
struct netdev *netdev;
--
1.7.2.5
More information about the dev
mailing list