X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-util.c;h=ede37b062697f7eb7aabeec9e0ed4e21b443994a;hb=24b7e19469dbd2cb3fdf8db70ef0c7b4bc851f17;hp=77804a67239e9a0a52fc2d6f02dea5832dd1f063;hpb=13b1febe4fa04e2dbd9ab9cf1485d519b1e81f1a;p=sliver-openvswitch.git diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 77804a672..ede37b062 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -1542,10 +1542,10 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, /* Get table ID. * - * OF1.1 entirely forbids table_id == 255. - * OF1.2+ allows table_id == 255 only for deletes. */ + * OF1.1 entirely forbids table_id == OFPTT_ALL. + * OF1.2+ allows table_id == OFPTT_ALL only for deletes. */ fm->table_id = ofm->table_id; - if (fm->table_id == 255 + if (fm->table_id == OFPTT_ALL && (oh->version == OFP11_VERSION || (ofm->command != OFPFC_DELETE && ofm->command != OFPFC_DELETE_STRICT))) { @@ -2093,7 +2093,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm, ofm->cookie = fm->cookie; } ofm->cookie_mask = fm->cookie_mask; - if (fm->table_id != 255 + if (fm->table_id != OFPTT_ALL || (protocol != OFPUTIL_P_OF11_STD && (fm->command == OFPFC_DELETE || fm->command == OFPFC_DELETE_STRICT))) {