From 0d5393af61a18e22a16da9ee083d9bfde454d504 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Wed, 31 Dec 2008 16:43:28 -0800
Subject: [PATCH] vswitchd: Minor code simplification.

The 'vlan' argument is exactly what we want here.
---
 vswitchd/bridge.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 81806d97..cd92ecd1 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1391,8 +1391,7 @@ compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan,
 
     while (mirrors) {
         struct mirror *m = br->mirrors[mirror_mask_ffs(mirrors) - 1];
-        if ((!m->n_vlans
-             || vlan_is_mirrored(m, in_port->vlan ? in_port->vlan : vlan))
+        if ((!m->n_vlans || vlan_is_mirrored(m, vlan))
             && set_dst(dst, flow, in_port, m->out_port, tags)) {
             if (m->set_vlan >= 0) {
                 dst->vlan = m->set_vlan;
-- 
2.30.2