aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKris Murphy <kriskend@linux.vnet.ibm.com>2017-03-16 11:51:28 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-30 03:41:21 -0400
commitef7c1e297d44de624e2ec5b0b8835bbdcf3efac4 (patch)
tree576d3f4aef43b6a0451fcfa4887cde92bf82da17
parentfafc9555d87a19c78bcd43ed731c3a73bf0b37a9 (diff)
openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD
[ Upstream commit 8f3dbfd79ed9ef9770305a7cc4e13dfd31ad2cd0 ] 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 <kriskend@linux.vnet.ibm.com> Acked-by: Joe Stringer <joe@ovn.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/openvswitch/flow_netlink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 677d7cc93017..07925418c2a5 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -649,6 +649,8 @@ static int ip_tun_from_nlattr(const struct nlattr *attr,
649 tun_flags |= TUNNEL_VXLAN_OPT; 649 tun_flags |= TUNNEL_VXLAN_OPT;
650 opts_type = type; 650 opts_type = type;
651 break; 651 break;
652 case OVS_TUNNEL_KEY_ATTR_PAD:
653 break;
652 default: 654 default:
653 OVS_NLERR(log, "Unknown IP tunnel attribute %d", 655 OVS_NLERR(log, "Unknown IP tunnel attribute %d",
654 type); 656 type);