datapath: openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD

openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD Added a case for OVS_TUNNEL_KEY_ATTR_PAD to the switch statement in ip_tun_from_nlattr in order to prevent the default case returning an error. Fixes: b46f6ded906e ("libnl: nla_put_be64(): align on a 64-bit area") Signed-off-by: Kris Murphy <[email protected]> Acked-by: Joe Stringer <[email protected]> Signed-off-by: David S. Miller <[email protected]> Upstream: 8f3dbfd79ed9("openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD") Fixes: f346481 ("datapath: backport: libnl: nla_put_be64(): align on a 64-bit area") Signed-off-by: Andy Zhou <[email protected]> Acked-by: Joe Stringer <[email protected]>
mangelajo · Apr 19, 2017 · 5d728d3 · 5d728d3
1 parent 5c54ca4
commit 5d728d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -179,6 +179,7 @@ Kevin Lo                        [email protected]
 Kevin Traynor                   [email protected]
 Khem Raj                        [email protected]
 Kmindg G                        [email protected]
+Kris Murphy                     [email protected]
 Krishna Kondaka                 [email protected]
 Kyle Mestery                    [email protected]
 Kyle Upton                      [email protected]

diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
@@ -667,6 +667,8 @@ static int ip_tun_from_nlattr(const struct nlattr *attr,
 			tun_flags |= TUNNEL_VXLAN_OPT;
 			opts_type = type;
 			break;
+		case OVS_TUNNEL_KEY_ATTR_PAD:
+			break;
 		default:
 			OVS_NLERR(log, "Unknown IP tunnel attribute %d",
 				  type);