Fix bug in clearing unsupported switch flags.

We need to keep the flags we support, not drop them.

diff --git a/datapath/forward.c b/datapath/forward.c
index 318cfb3..524ee14 100644 (file)
--- a/datapath/forward.c
+++ b/datapath/forward.c
@@ -308,7 +308,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_SEND_FLOW_EXP | 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/switch/datapath.c b/switch/datapath.c
index 13d06ff..4d52dda 100644 (file)
--- a/switch/datapath.c
+++ b/switch/datapath.c
@@ -985,7 +985,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_SEND_FLOW_EXP | 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;