X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fin-band.c;h=2013869c5a131aa00b9d825118e46d564910dc33;hb=ab7b77bbf7b146feec239392cb4281949935b4a6;hp=13093e08c0173046ea8fadba564ef8cc6a3a7248;hpb=6ecf431e1df3dc011e8a67e4864d324c65f4be17;p=openvswitch diff --git a/ofproto/in-band.c b/ofproto/in-band.c index 13093e08..2013869c 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ #include #include "classifier.h" #include "dhcp.h" -#include "dpif.h" #include "flow.h" #include "netdev.h" #include "netlink.h" @@ -413,7 +412,7 @@ in_band_run(struct in_band *ib) struct in_band_rule *rule, *next; memset(&actions, 0, sizeof actions); - actions.oa.output.type = htons(OFPAT_OUTPUT); + actions.oa.output.type = htons(OFPAT10_OUTPUT); actions.oa.output.len = htons(sizeof actions.oa); actions.oa.output.port = htons(OFPP_NORMAL); actions.oa.output.max_len = htons(0); @@ -421,7 +420,7 @@ in_band_run(struct in_band *ib) a = &actions.oa; na = sizeof actions.oa / sizeof(union ofp_action); } else { - actions.nxsq.type = htons(OFPAT_VENDOR); + actions.nxsq.type = htons(OFPAT10_VENDOR); actions.nxsq.len = htons(sizeof actions.nxsq); actions.nxsq.vendor = htonl(NX_VENDOR_ID); actions.nxsq.subtype = htons(NXAST_SET_QUEUE);