On 10/31/2018 8:30 AM, Jaime Caamaño Ruiz wrote:
When validating push/pop ethernet actions, mac_proto is not being reset
correctly.
Signed-off-by: Jaime Caamaño Ruiz <[email protected]>
Reported-at:
https://mail.openvswitch.org/pipermail/ovs-discuss/2018-October/047554.html
Fixes: 6fcecb85ab ("datapath: add Ethernet push and pop actions")
Jaime,
The order of tags should be:
Reported-at:
Fixes:
Signed-off-by:
Here's a helpful guide:
http://docs.openvswitch.org/en/latest/internals/contributing/submitting-patches/
Perhaps the maintainers can fix that up on commit or they might want you
to send another.
In any case:
Tested-by: Greg Rose <[email protected]>
Reviewed-by: Greg Rose <[email protected]>
Thanks Jaime!
- Greg
---
datapath/flow_netlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
index c3f1baa05..ee0c18422 100644
--- a/datapath/flow_netlink.c
+++ b/datapath/flow_netlink.c
@@ -2998,7 +2998,7 @@ static int __ovs_nla_copy_actions(struct net *net, const
struct nlattr *attr,
* is already present */
if (mac_proto != MAC_PROTO_NONE)
return -EINVAL;
- mac_proto = MAC_PROTO_NONE;
+ mac_proto = MAC_PROTO_ETHERNET;
break;
case OVS_ACTION_ATTR_POP_ETH:
@@ -3006,7 +3006,7 @@ static int __ovs_nla_copy_actions(struct net *net, const
struct nlattr *attr,
return -EINVAL;
if (vlan_tci & htons(VLAN_TAG_PRESENT))
return -EINVAL;
- mac_proto = MAC_PROTO_ETHERNET;
+ mac_proto = MAC_PROTO_NONE;
break;
case OVS_ACTION_ATTR_PUSH_NSH:
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
