diff options
author | Jiri Pirko <jiri@mellanox.com> | 2017-02-09 14:42:03 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-10 13:42:50 -0500 |
commit | dc371700d43e45ed9bf380746e293f063113c2b1 (patch) | |
tree | 880f1f0bbb458efa075d9dc884df329580337066 /drivers | |
parent | 201dacbb1d77e3227aa61b7b9fd375ae201e86b2 (diff) | |
download | linux-dc371700d43e45ed9bf380746e293f063113c2b1.tar.gz linux-dc371700d43e45ed9bf380746e293f063113c2b1.tar.xz |
spectrum: flower: Treat ETH_P_ALL as a special case and translate for HW
HW does not understand ETH_P_ALL. So treat this special case differently
and translate to 0/0 key/mask. That will allow HW to match all ethertypes.
Fixes: 7aa0f5aa9030 ("mlxsw: spectrum: Implement TC flower offload")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c index 35b147a47eb5..22ab42925377 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c @@ -197,11 +197,18 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, skb_flow_dissector_target(f->dissector, FLOW_DISSECTOR_KEY_BASIC, f->mask); - ip_proto = key->ip_proto; + u16 n_proto_key = ntohs(key->n_proto); + u16 n_proto_mask = ntohs(mask->n_proto); + + if (n_proto_key == ETH_P_ALL) { + n_proto_key = 0; + n_proto_mask = 0; + } mlxsw_sp_acl_rulei_keymask_u32(rulei, MLXSW_AFK_ELEMENT_ETHERTYPE, - ntohs(key->n_proto), - ntohs(mask->n_proto)); + n_proto_key, n_proto_mask); + + ip_proto = key->ip_proto; mlxsw_sp_acl_rulei_keymask_u32(rulei, MLXSW_AFK_ELEMENT_IP_PROTO, key->ip_proto, mask->ip_proto); |