From: Justin Pettit <jpettit@nicira.com>
Date: Thu, 22 Sep 2011 06:43:10 +0000 (-0700)
Subject: datapath: Fix unused 'done' label build warning in flow.c.
X-Git-Tag: v1.2.2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Ftags%2Fv1.2.2;p=sliver-openvswitch.git

datapath: Fix unused 'done' label build warning in flow.c.

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 <jpettit@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/flow.c b/datapath/flow.c
index d9e3602bc..a13edeb7f 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;
 }