On Thu, May 30, 2013 at 03:50:46PM -0700, Alex Wang wrote:
> Commit 52a90c29 (Implement new "VLAN splinters" feature) passed in OpenFlow
> port number to vsp_realdev_to_vlandev() function which asks for datapath port
> number.
>
> This patch fixes this bug by making the vsp_realdev_to_vlandev() function
> take in and return OpenFlow port number.
>
> Signed-off-by: Alex Wang <al...@nicira.com>
I was ready to apply this but there's a patch reject against current master:
Applying: ofproto-dpif.c: Modify vsp_realdev_to_vlandev() function
Checking patch ofproto/ofproto-dpif.c...
error: while searching for:
ctx->odp_actions);
ctx->flow.tunnel = flow_tnl; /* Restore tunnel metadata */
} else {
odp_port = ofport->odp_port;
out_port = vsp_realdev_to_vlandev(ctx->ofproto, odp_port,
ctx->flow.vlan_tci);
if (out_port != odp_port) {
ctx->flow.vlan_tci = htons(0);
}
ctx->flow.skb_mark &= ~IPSEC_MARK;
error: patch failed: ofproto/ofproto-dpif.c:6182
Applying patch ofproto/ofproto-dpif.c with 1 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Patch failed at 0001 ofproto-dpif.c: Modify vsp_realdev_to_vlandev() function
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Can you update the patch?
Thanks,
Ben.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
