[ovs-dev] [PATCH 2/4] bridge: Minor cleanup in process_flow().
Ben Pfaff
blp at nicira.com
Fri Apr 16 00:11:57 UTC 2010
Should have no externally visible effect.
---
vswitchd/bridge.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index baa889b..187115c 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -2255,16 +2255,13 @@ process_flow(struct bridge *br, const flow_t *flow,
}
}
- /* MAC learning. */
- out_port = FLOOD_PORT;
/* Learn source MAC (but don't try to learn from revalidation). */
if (packet) {
update_learning_table(br, flow, vlan, in_port);
}
/* Determine output port. */
- out_port_idx = mac_learning_lookup_tag(br->ml, flow->dl_dst, vlan,
- tags);
+ out_port_idx = mac_learning_lookup_tag(br->ml, flow->dl_dst, vlan, tags);
if (out_port_idx >= 0 && out_port_idx < br->n_ports) {
out_port = br->ports[out_port_idx];
} else if (!packet && !eth_addr_is_multicast(flow->dl_dst)) {
@@ -2274,6 +2271,8 @@ process_flow(struct bridge *br, const flow_t *flow,
* on a bond and blackhole packets before the learning table is
* updated to reflect the correct port. */
return false;
+ } else {
+ out_port = FLOOD_PORT;
}
/* Don't send packets out their input ports. */
--
1.6.6.1
More information about the dev
mailing list