Since it's not clear from the message, this commit is for "branch-1.2".
--Justin On Sep 21, 2011, at 11:51 PM, Justin Pettit wrote: > Commit d6b37e42 (datapath: Allow a packet with no input port to omit > ODP_KEY_ATTR_IN_PORT.) was a crossport from commit 18886b6 in the > "master" branch, but dropped a few lines. This causes a compiler > warning about an unused "done" label. This commit brings the two > patches in line. > > Signed-off-by: Justin Pettit <[email protected]> > --- > datapath/flow.c | 4 ---- > 1 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/datapath/flow.c b/datapath/flow.c > index d9e3602..a13edeb 100644 > --- a/datapath/flow.c > +++ b/datapath/flow.c > @@ -922,10 +922,6 @@ int flow_metadata_from_nlattrs(u16 *in_port, __be64 > *tun_id, > if (rem) > return -EINVAL; > > -done: > - if (prev_type == ODP_KEY_ATTR_UNSPEC || > - prev_type == ODP_KEY_ATTR_TUN_ID) > - return -EINVAL; > return 0; > } > > -- > 1.7.1 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
