diff options
| author | Justin Pettit <jpettit@nicira.com> | 2011-09-21 23:43:10 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2011-09-22 13:25:08 -0700 |
| commit | 10c88ad74da016a233fd61d1d808f4f04fde951a (patch) | |
| tree | b0b33d0fd080d5cb338ef9f8282736d7d278e434 | |
| parent | b36349b4fdd496fb26c1d02ddb7770fcb1002100 (diff) | |
| download | openvswitch-10c88ad74da016a233fd61d1d808f4f04fde951a.tar.gz | |
datapath: Fix unused 'done' label build warning in flow.c.v1.2.2
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>
| -rw-r--r-- | datapath/flow.c | 4 |
1 files changed, 0 insertions, 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; } |