On Thu, Nov 10, 2011 at 06:51:39PM -0800, Justin Pettit wrote:
> On Oct 26, 2011, at 10:09 AM, Ben Pfaff wrote:
>
> > @@ -4810,6 +4821,7 @@ is_admissible(struct ofproto_dpif *ofproto, const
> > struct flow *flow,
> > {
>
> The comment for is_admissable() seems out of date. It refers to
> "in_portp", but I'm guessing it should be referring to "in_bundlep".
> Also, I think you'll want to update the comment to not refer to
> flow_get_vlan() anymore, since you've deleted it.
Thanks. I updated the comment:
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 40a0a29..91714c9 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -4795,36 +4795,36 @@ update_learning_table(struct ofproto_dpif *ofproto,
"on port %s in VLAN %d",
ofproto->up.name, ETH_ADDR_ARGS(flow->dl_src),
in_bundle->name, vlan);
mac->port.p = in_bundle;
tag_set_add(&ofproto->revalidate_set,
mac_learning_changed(ofproto->ml, mac));
}
}
-/* Determines whether packets in 'flow' within 'br' should be forwarded or
+/* Determines whether packets in 'flow' within 'ofproto' should be forwarded or
* dropped. Returns true if they may be forwarded, false if they should be
* dropped.
*
* If 'have_packet' is true, it indicates that the caller is processing a
* received packet. If 'have_packet' is false, then the caller is just
* revalidating an existing flow because configuration has changed. Either
* way, 'have_packet' only affects logging (there is no point in logging errors
* during revalidation).
*
- * Sets '*in_portp' to the input port. This will be a null pointer if
+ * Sets '*in_bundlep' to the input bundle. This will be a null pointer if
* flow->in_port does not designate a known input port (in which case
* is_admissible() returns false).
*
* When returning true, sets '*vlanp' to the effective VLAN of the input
- * packet, as returned by flow_get_vlan().
+ * packet, as returned by input_vid_to_vlan().
*
* May also add tags to '*tags', although the current implementation only does
* so in one special case.
*/
static bool
is_admissible(struct ofproto_dpif *ofproto, const struct flow *flow,
bool have_packet,
tag_type *tags, int *vlanp, struct ofbundle **in_bundlep)
{
struct ofport_dpif *in_port;
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
