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: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index b320685..3220277 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -130,7 +130,7 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,
                                   "only offload of BPF classifiers supported");
                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;
        if (!nfp_net_ebpf_capable(nn)) {
                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,
                                   "only ETH_P_ALL supported as filter protocol");
                return -EOPNOTSUPP;
        }
-       if (cls_bpf->common.chain_index)
-               return -EOPNOTSUPP;
 
        /* Only support TC direct action */
        if (!cls_bpf->exts_integrated ||

diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index 837134a..08c4c6d 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -483,8 +483,7 @@ static int
 nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,
                        struct tc_cls_flower_offload *flower, bool egress)
 {
-       if (!eth_proto_is_802_3(flower->common.protocol) ||
-           flower->common.chain_index)
+       if (!eth_proto_is_802_3(flower->common.protocol))
                return -EOPNOTSUPP;
 
        switch (flower->command) {
@@ -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;
 
-       if (!tc_can_offload(repr->netdev))
+       if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data))
                return -EOPNOTSUPP;
 
        switch (type) {
@@ -521,7 +520,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,
 {
        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;
 
        switch (type) {