X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.c;h=52a996a54cc7acfab9ef0d5b9f66aaf71eef039a;hb=3fd8d44544df9c4cdb6108a72154f7ebc5077dd0;hp=00d1af76f56f5548ad8f9f9e9e88d86e58d52932;hpb=75a75043564dc9b002fffa6c6ad71e0d4d5c892e;p=openvswitch diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 00d1af76..52a996a5 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -344,9 +344,6 @@ static int ofputil_decode_vendor(const struct ofp_header *oh, const struct ofputil_msg_type **typep) { - BUILD_ASSERT_DECL(sizeof(struct nxt_set_flow_format) - != sizeof(struct nxt_flow_mod_table_id)); - static const struct ofputil_msg_type nxt_messages[] = { { OFPUTIL_NXT_ROLE_REQUEST, NXT_ROLE_REQUEST, "NXT_ROLE_REQUEST", @@ -1871,7 +1868,7 @@ make_packet_out(const struct ofpbuf *packet, uint32_t buffer_id, opo->header.length = htons(size); opo->header.xid = htonl(0); opo->buffer_id = htonl(buffer_id); - opo->in_port = htons(in_port == OVSP_LOCAL ? OFPP_LOCAL : in_port); + opo->in_port = htons(in_port); opo->actions_len = htons(actions_len); ofpbuf_put(out, actions, actions_len); if (packet) {