|
@@ -1635,8 +1635,8 @@ static int of_dpa_cmd_add_multicast_routing(OfDpaFlow *flow,
|
|
|
return ROCKER_OK;
|
|
|
}
|
|
|
|
|
|
-static int of_dpa_cmd_add_acl_ip(OfDpaFlowKey *key, OfDpaFlowKey *mask,
|
|
|
- RockerTlv **flow_tlvs)
|
|
|
+static void of_dpa_cmd_add_acl_ip(OfDpaFlowKey *key, OfDpaFlowKey *mask,
|
|
|
+ RockerTlv **flow_tlvs)
|
|
|
{
|
|
|
key->width = FLOW_KEY_WIDTH(ip.tos);
|
|
|
|
|
@@ -1669,8 +1669,6 @@ static int of_dpa_cmd_add_acl_ip(OfDpaFlowKey *key, OfDpaFlowKey *mask,
|
|
|
mask->ip.tos |=
|
|
|
rocker_tlv_get_u8(flow_tlvs[ROCKER_TLV_OF_DPA_IP_ECN_MASK]) << 6;
|
|
|
}
|
|
|
-
|
|
|
- return ROCKER_OK;
|
|
|
}
|
|
|
|
|
|
static int of_dpa_cmd_add_acl(OfDpaFlow *flow, RockerTlv **flow_tlvs)
|
|
@@ -1689,7 +1687,6 @@ static int of_dpa_cmd_add_acl(OfDpaFlow *flow, RockerTlv **flow_tlvs)
|
|
|
ACL_MODE_ANY_VLAN,
|
|
|
ACL_MODE_ANY_TENANT,
|
|
|
} mode = ACL_MODE_UNKNOWN;
|
|
|
- int err = ROCKER_OK;
|
|
|
|
|
|
if (!flow_tlvs[ROCKER_TLV_OF_DPA_IN_PPORT] ||
|
|
|
!flow_tlvs[ROCKER_TLV_OF_DPA_ETHERTYPE]) {
|
|
@@ -1776,14 +1773,10 @@ static int of_dpa_cmd_add_acl(OfDpaFlow *flow, RockerTlv **flow_tlvs)
|
|
|
switch (ntohs(key->eth.type)) {
|
|
|
case 0x0800:
|
|
|
case 0x86dd:
|
|
|
- err = of_dpa_cmd_add_acl_ip(key, mask, flow_tlvs);
|
|
|
+ of_dpa_cmd_add_acl_ip(key, mask, flow_tlvs);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if (err) {
|
|
|
- return err;
|
|
|
- }
|
|
|
-
|
|
|
if (flow_tlvs[ROCKER_TLV_OF_DPA_GROUP_ID]) {
|
|
|
action->write.group_id =
|
|
|
rocker_tlv_get_le32(flow_tlvs[ROCKER_TLV_OF_DPA_GROUP_ID]);
|