cxgb4: Convert ndo_setup_tc offloads to block callbacks

Benefit from the newly introduced block callback infrastructure and
convert ndo_setup_tc calls for flower and u32 offloads to block callbacks.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index c478291..3cd82ae 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2889,8 +2889,7 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)
 static int cxgb_setup_tc_flower(struct net_device *dev,
                                struct tc_cls_flower_offload *cls_flower)
 {
-       if (!is_classid_clsact_ingress(cls_flower->common.classid) ||
-           cls_flower->common.chain_index)
+       if (cls_flower->common.chain_index)
                return -EOPNOTSUPP;
 
        switch (cls_flower->command) {
@@ -2908,8 +2907,7 @@ static int cxgb_setup_tc_flower(struct net_device *dev,
 static int cxgb_setup_tc_cls_u32(struct net_device *dev,
                                 struct tc_cls_u32_offload *cls_u32)
 {
-       if (!is_classid_clsact_ingress(cls_u32->common.classid) ||
-           cls_u32->common.chain_index)
+       if (cls_u32->common.chain_index)
                return -EOPNOTSUPP;
 
        switch (cls_u32->command) {
@@ -2923,9 +2921,10 @@ static int cxgb_setup_tc_cls_u32(struct net_device *dev,
        }
 }
 
-static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,
-                        void *type_data)
+static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data,
+                                 void *cb_priv)
 {
+       struct net_device *dev = cb_priv;
        struct port_info *pi = netdev2pinfo(dev);
        struct adapter *adap = netdev2adap(dev);
 
@@ -2946,6 +2945,40 @@ static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,
        }
 }
 
+static int cxgb_setup_tc_block(struct net_device *dev,
+                              struct tc_block_offload *f)
+{
+       struct port_info *pi = netdev2pinfo(dev);
+
+       if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
+               return -EOPNOTSUPP;
+
+       switch (f->command) {
+       case TC_BLOCK_BIND:
+               return tcf_block_cb_register(f->block, cxgb_setup_tc_block_cb,
+                                            pi, dev);
+       case TC_BLOCK_UNBIND:
+               tcf_block_cb_unregister(f->block, cxgb_setup_tc_block_cb, pi);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,
+                        void *type_data)
+{
+       switch (type) {
+       case TC_SETUP_CLSU32:
+       case TC_SETUP_CLSFLOWER:
+               return 0; /* will be removed after conversion from ndo */
+       case TC_SETUP_BLOCK:
+               return cxgb_setup_tc_block(dev, type_data);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
 static netdev_features_t cxgb_fix_features(struct net_device *dev,
                                           netdev_features_t features)
 {