diff --git a/datapath/forward.c b/datapath/forward.c index ffb6e5c..767981b 100644 --- a/datapath/forward.c +++ b/datapath/forward.c @@ -105,7 +105,7 @@ recv_set_config(struct sw_chain *chain, const struct sender *sender, const struct ofp_switch_config *osc = msg; int flags; - flags = ntohs(osc->flags) & (OFPC_SEND_FLOW_EXP | OFPC_FRAG_MASK); + flags = ntohs(osc->flags) & OFPC_FRAG_MASK; if ((flags & OFPC_FRAG_MASK) != OFPC_FRAG_NORMAL && (flags & OFPC_FRAG_MASK) != OFPC_FRAG_DROP) { flags = (flags & ~OFPC_FRAG_MASK) | OFPC_FRAG_DROP; diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 3778823..051bfe9 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -347,7 +347,7 @@ send_features_request(struct lswitch *sw, struct rconn *rconn) /* Send OFPT_SET_CONFIG. */ osc = make_openflow(sizeof *osc, OFPT_SET_CONFIG, &b); - osc->flags = htons(OFPC_SEND_FLOW_EXP); + osc->flags = 0; osc->miss_send_len = htons(OFP_DEFAULT_MISS_SEND_LEN); queue_tx(sw, rconn, b); diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 13f596f..4a6706e 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -589,10 +589,6 @@ ofp_print_switch_config(struct ds *string, const void *oh, size_t len UNUSED, uint16_t flags; flags = ntohs(osc->flags); - if (flags & OFPC_SEND_FLOW_EXP) { - flags &= ~OFPC_SEND_FLOW_EXP; - ds_put_format(string, " (sending flow expirations)"); - } if (flags) { ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", flags); } diff --git a/secchan/flow-end.c b/secchan/flow-end.c index cc2a505..5e34939 100644 --- a/secchan/flow-end.c +++ b/secchan/flow-end.c @@ -279,12 +279,6 @@ flow_end_remote_packet_cb(struct relay *r, void *flow_end_) return false; } - if (osc->flags & htons(OFPC_SEND_FLOW_EXP)) { - fe->send_ofp_exp = true; - } else { - fe->send_ofp_exp = false; - } - send_nx_flow_end_config(fe); return false; diff --git a/udatapath/datapath.c b/udatapath/datapath.c index 93f3095..fdb643c 100644 --- a/udatapath/datapath.c +++ b/udatapath/datapath.c @@ -895,7 +895,7 @@ recv_set_config(struct datapath *dp, const struct sender *sender UNUSED, const struct ofp_switch_config *osc = msg; int flags; - flags = ntohs(osc->flags) & (OFPC_SEND_FLOW_EXP | OFPC_FRAG_MASK); + flags = ntohs(osc->flags) & OFPC_FRAG_MASK; if ((flags & OFPC_FRAG_MASK) != OFPC_FRAG_NORMAL && (flags & OFPC_FRAG_MASK) != OFPC_FRAG_DROP) { flags = (flags & ~OFPC_FRAG_MASK) | OFPC_FRAG_DROP;