net_sch: mqprio: Change TC_SETUP_MQPRIO to TC_SETUP_QDISC_MQPRIO

Change TC_SETUP_MQPRIO to TC_SETUP_QDISC_MQPRIO to match the new
convention.

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 3d53153ce7515b5992eb9e1e96ff5157db2c6319..a74a8fbad53a57f95ac32a980b6d96da136e5972 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -2206,7 +2206,7 @@ static int xgbe_setup_tc(struct net_device *netdev, enum tc_setup_type type,
        struct tc_mqprio_qopt *mqprio = type_data;
        u8 tc;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 1216c1f1e05213d478de3313b4928d4d029b81f4..4c739d5355d2279a5f1c4cd23e8ccf3288788e8d 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -4289,7 +4289,7 @@ int __bnx2x_setup_tc(struct net_device *dev, enum tc_setup_type type,
 {
        struct tc_mqprio_qopt *mqprio = type_data;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 96416f5d97f321d3d63de09bf3d88720617bdd1f..e5472e5ae7b254fc4a877eb3750cefbc1c821bd6 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7388,7 +7388,7 @@ static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,
        switch (type) {
        case TC_SETUP_BLOCK:
                return bnxt_setup_tc_block(dev, type_data);
-       case TC_SETUP_MQPRIO: {
+       case TC_SETUP_QDISC_MQPRIO: {
                struct tc_mqprio_qopt *mqprio = type_data;
 
                mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index ebc55b6a6349379986068b5e74edbddef4e41714..784dbf5a3e12d4071c3dcd8108a4cf551fe1ff75 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -351,7 +351,7 @@ static int dpaa_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
        u8 num_tc;
        int i;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
index 2a0af11c9b5993bc66363909bb2e93760bf4bf41..59415090ff0f789128979d2511f1133d69c178a2 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
@@ -1252,7 +1252,7 @@ static int hns3_setup_tc(struct net_device *netdev, void *type_data)
 static int hns3_nic_setup_tc(struct net_device *dev, enum tc_setup_type type,
                             void *type_data)
 {
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        return hns3_setup_tc(dev, type_data);

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 81e4425f052942882074fc3b338113559d8883ac..adc62fb38c49e4a1933b298e4228067ea3dd67bd 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -1389,7 +1389,7 @@ static int __fm10k_setup_tc(struct net_device *dev, enum tc_setup_type type,
 {
        struct tc_mqprio_qopt *mqprio = type_data;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 05b94d87a6c3847c7718518d9c47f9fd34b787d5..17e6f64299cf94747561fa5fb260faf967a18004 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7550,7 +7550,7 @@ static int __i40e_setup_tc(struct net_device *netdev, enum tc_setup_type type,
                           void *type_data)
 {
        switch (type) {
-       case TC_SETUP_MQPRIO:
+       case TC_SETUP_QDISC_MQPRIO:
                return i40e_setup_tc(netdev, type_data);
        case TC_SETUP_BLOCK:
                return i40e_setup_tc_block(netdev, type_data);

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e5dcb25be398d20b8aa1ab1edbfcf856a0c18877..6eaca8366ac88c4cb0d271413d2f33d6bf497bde 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9431,7 +9431,7 @@ static int __ixgbe_setup_tc(struct net_device *dev, enum tc_setup_type type,
        switch (type) {
        case TC_SETUP_BLOCK:
                return ixgbe_setup_tc_block(dev, type_data);
-       case TC_SETUP_MQPRIO:
+       case TC_SETUP_QDISC_MQPRIO:
                return ixgbe_setup_tc_mqprio(dev, type_data);
        default:
                return -EOPNOTSUPP;

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 736a6ccaf05eb13453c2dcec2cc6bbccb78b45bf..99051a294fa649f52f2b46bab94ee47d8b980ba3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -135,7 +135,7 @@ static int __mlx4_en_setup_tc(struct net_device *dev, enum tc_setup_type type,
 {
        struct tc_mqprio_qopt *mqprio = type_data;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        if (mqprio->num_tc && mqprio->num_tc != MLX4_EN_NUM_UP_HIGH)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index f877f2f5f2a5482d4be9d6604710b45c74e3b93a..5d5d2e50e4bf7d3b4ba931abae9e242ab89d83c9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3146,7 +3146,7 @@ int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type,
        case TC_SETUP_BLOCK:
                return mlx5e_setup_tc_block(dev, type_data);
 #endif
-       case TC_SETUP_MQPRIO:
+       case TC_SETUP_QDISC_MQPRIO:
                return mlx5e_setup_tc_mqprio(dev, type_data);
        default:
                return -EOPNOTSUPP;

diff --git a/drivers/net/ethernet/sfc/falcon/tx.c b/drivers/net/ethernet/sfc/falcon/tx.c
index 6a75f4140a4be3c96782d79a72f7efc6162e2a3f..1b978d69e702467dfdb9166157fc6d6daecdf3c8 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/tx.c
+++ b/drivers/net/ethernet/sfc/falcon/tx.c
@@ -435,7 +435,7 @@ int ef4_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
        unsigned tc, num_tc;
        int rc;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        num_tc = mqprio->num_tc;

diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index 32bf1fecf86406d7a51cc61bd03388f5ad090312..ea27b8a7f46502e72b48d5c02024adfa8f965d9c 100644 (file)
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -663,7 +663,7 @@ int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
        unsigned tc, num_tc;
        int rc;
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        num_tc = mqprio->num_tc;

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 437d36289786bbbe8f153910ee797b13379b61e3..15e2e3031d365c506ff540a212362011c7c5fa70 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1887,7 +1887,7 @@ static int netcp_setup_tc(struct net_device *dev, enum tc_setup_type type,
        /* setup tc must be called under rtnl lock */
        ASSERT_RTNL();
 
-       if (type != TC_SETUP_MQPRIO)
+       if (type != TC_SETUP_QDISC_MQPRIO)
                return -EOPNOTSUPP;
 
        mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 71968a2ca9f39062782a6d067bfe71f82e68a2b1..703885aed856dab7c5b7065d0f3d90ae0e7c18c6 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -770,7 +770,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
                                       struct sk_buff *skb);
 
 enum tc_setup_type {
-       TC_SETUP_MQPRIO,
+       TC_SETUP_QDISC_MQPRIO,
        TC_SETUP_CLSU32,
        TC_SETUP_CLSFLOWER,
        TC_SETUP_CLSMATCHALL,

diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index 4d5ed45123f033d865f56f0217dde763fff136bb..b85885a9d8a1db809ec93bd6347692334b410faf 100644 (file)
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -50,7 +50,8 @@ static void mqprio_destroy(struct Qdisc *sch)
                switch (priv->mode) {
                case TC_MQPRIO_MODE_DCB:
                case TC_MQPRIO_MODE_CHANNEL:
-                       dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MQPRIO,
+                       dev->netdev_ops->ndo_setup_tc(dev,
+                                                     TC_SETUP_QDISC_MQPRIO,
                                                      &mqprio);
                        break;
                default:
@@ -265,7 +266,7 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt)
                        return -EINVAL;
                }
                err = dev->netdev_ops->ndo_setup_tc(dev,
-                                                   TC_SETUP_MQPRIO,
+                                                   TC_SETUP_QDISC_MQPRIO,
                                                    &mqprio);
                if (err)
                        return err;