From 9a87628422cf1fdab12dd264531dc874a9ac2ccd Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 1 Jun 2011 09:34:20 -0700 Subject: [PATCH] learning-switch: Wildcard more fields to avoid normalization warnings. FWW_NW_TOS and some other L3 fields weren't wildcarded, but should have been. It's better to start with all fields wildcarded and then unwildcard the ones that shouldn't be. Reported-by: Jean Tourrilhes --- lib/learning-switch.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 9d3605ae9..56c065cd5 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -99,15 +99,16 @@ lswitch_create(struct rconn *rconn, const struct lswitch_config *cfg) sw->ml = cfg->mode == LSW_LEARN ? mac_learning_create() : NULL; sw->action_normal = cfg->mode == LSW_NORMAL; - flow_wildcards_init_exact(&sw->wc); if (!cfg->exact_flows) { /* We cannot wildcard all fields. * We need in_port to detect moves. * We need both SA and DA to do learning. */ - sw->wc.wildcards = (FWW_DL_TYPE | FWW_NW_PROTO - | FWW_TP_SRC | FWW_TP_DST); - sw->wc.nw_src_mask = htonl(0); - sw->wc.nw_dst_mask = htonl(0); + flow_wildcards_init_catchall(&sw->wc); + sw->wc.wildcards &= ~(FWW_IN_PORT | FWW_DL_SRC | FWW_DL_DST + | FWW_ETH_MCAST); + sw->wc.vlan_tci_mask = htons(VLAN_CFI | VLAN_VID_MASK); + } else { + flow_wildcards_init_exact(&sw->wc); } sw->default_queue = cfg->default_queue; -- 2.43.0