From: Kris Murphy <[email protected]>
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: f34648187b03 ("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]>
---
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 --git a/AUTHORS.rst b/AUTHORS.rst
index 36df68b270e6..c18b3ebba0d3 100644
--- 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
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);
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
