Commit 3107fdc8 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

nfp: use tc_cls_can_offload_and_chain0()

Make use of tc_cls_can_offload_and_chain0() to set extack msg in case
ethtool tc offload flag is not set or chain unsupported.
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2b212a5
...@@ -130,7 +130,7 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, ...@@ -130,7 +130,7 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,
"only offload of BPF classifiers supported"); "only offload of BPF classifiers supported");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (!tc_can_offload_extack(nn->dp.netdev, cls_bpf->common.extack)) if (!tc_cls_can_offload_and_chain0(nn->dp.netdev, &cls_bpf->common))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!nfp_net_ebpf_capable(nn)) { if (!nfp_net_ebpf_capable(nn)) {
NL_SET_ERR_MSG_MOD(cls_bpf->common.extack, NL_SET_ERR_MSG_MOD(cls_bpf->common.extack,
...@@ -142,8 +142,6 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, ...@@ -142,8 +142,6 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,
"only ETH_P_ALL supported as filter protocol"); "only ETH_P_ALL supported as filter protocol");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (cls_bpf->common.chain_index)
return -EOPNOTSUPP;
/* Only support TC direct action */ /* Only support TC direct action */
if (!cls_bpf->exts_integrated || if (!cls_bpf->exts_integrated ||
......
...@@ -483,8 +483,7 @@ static int ...@@ -483,8 +483,7 @@ static int
nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev, nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,
struct tc_cls_flower_offload *flower, bool egress) struct tc_cls_flower_offload *flower, bool egress)
{ {
if (!eth_proto_is_802_3(flower->common.protocol) || if (!eth_proto_is_802_3(flower->common.protocol))
flower->common.chain_index)
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (flower->command) { switch (flower->command) {
...@@ -504,7 +503,7 @@ int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data, ...@@ -504,7 +503,7 @@ int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data,
{ {
struct nfp_repr *repr = cb_priv; struct nfp_repr *repr = cb_priv;
if (!tc_can_offload(repr->netdev)) if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data))
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (type) { switch (type) {
...@@ -521,7 +520,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type, ...@@ -521,7 +520,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,
{ {
struct nfp_repr *repr = cb_priv; struct nfp_repr *repr = cb_priv;
if (!tc_can_offload(repr->netdev)) if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data))
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (type) { switch (type) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment