From 10c88ad74da016a233fd61d1d808f4f04fde951a Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Wed, 21 Sep 2011 23:43:10 -0700 Subject: [PATCH] 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 Acked-by: Jesse Gross --- datapath/flow.c | 4 ---- 1 file changed, 4 deletions(-) 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; } -- 2.43.0