diff mbox

[ovs-dev,datapath,backport,v2,06/10] datapath: openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD

Message ID 1492211174-28936-6-git-send-email-azhou@ovn.org
State Accepted
Headers show

Commit Message

Andy Zhou April 14, 2017, 11:06 p.m. UTC 
From: Kris Murphy <kriskend@linux.vnet.ibm.com>

    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 <kriskend@linux.vnet.ibm.com>
    Acked-by: Joe Stringer <joe@ovn.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Upstream: 8f3dbfd79ed9("openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD")

Fixes: f34648187b03 ("datapath: backport: libnl: nla_put_be64(): align
on a 64-bit area")

Signed-off-by: Andy Zhou <azhou@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>

---
v1->v2: Add ovs fixes message.
        Note, backport to 2.6+
---
 AUTHORS.rst             | 1 +
 datapath/flow_netlink.c | 2 ++
 2 files changed, 3 insertions(+)
diff mbox

Patch

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 36df68b270e6..c18b3ebba0d3 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -179,6 +179,7 @@  Kevin Lo                        kevlo@FreeBSD.org
 Kevin Traynor                   kevin.traynor@intel.com
 Khem Raj                        raj.khem@gmail.com
 Kmindg G                        kmindg@gmail.com
+Kris Murphy                     kriskend@linux.vnet.ibm.com
 Krishna Kondaka                 kkondaka@vmware.com
 Kyle Mestery                    mestery@mestery.com
 Kyle Upton                      kupton@baymicrosystems.com
diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
index e31852ebb421..704e2da5f7a6 100644
--- 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);