You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
134 lines
4.6 KiB
134 lines
4.6 KiB
Date: Thu, 18 Jun 2020 19:42:45 -0400
|
|
From: Jonathan Toppins <jtoppins@redhat.com>
|
|
To: rhkernel-list@redhat.com
|
|
Cc: darcari@redhat.com, nhorman@redhat.com, linville@redhat.com
|
|
Subject: [PATCH RHEL-8.3 10/16] ionic: more ionic name tweaks
|
|
|
|
Fix up a few more local names that need an "ionic" prefix.
|
|
|
|
Signed-off-by: Shannon Nelson <snelson@pensando.io>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
(cherry picked from commit c06107cabea356db62f45bf8049a260c238fadf2)
|
|
Bugzilla: 1848149
|
|
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=29498383
|
|
Tested: QE tested devel kernel as well as the partner
|
|
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
---
|
|
drivers/net/ethernet/pensando/ionic/ionic_dev.h | 10 +++++-----
|
|
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 13 +++++++------
|
|
drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 ++--
|
|
3 files changed, 14 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.h b/drivers/net/ethernet/pensando/ionic/ionic_dev.h
|
|
index 33519a8765eb..525434f10025 100644
|
|
--- a/drivers/net/ethernet/pensando/ionic/ionic_dev.h
|
|
+++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.h
|
|
@@ -182,7 +182,7 @@ struct ionic_desc_info {
|
|
void *cb_arg;
|
|
};
|
|
|
|
-#define QUEUE_NAME_MAX_SZ 32
|
|
+#define IONIC_QUEUE_NAME_MAX_SZ 32
|
|
|
|
struct ionic_queue {
|
|
u64 dbell_count;
|
|
@@ -207,14 +207,14 @@ struct ionic_queue {
|
|
unsigned int desc_size;
|
|
unsigned int sg_desc_size;
|
|
unsigned int pid;
|
|
- char name[QUEUE_NAME_MAX_SZ];
|
|
+ char name[IONIC_QUEUE_NAME_MAX_SZ];
|
|
};
|
|
|
|
-#define INTR_INDEX_NOT_ASSIGNED -1
|
|
-#define INTR_NAME_MAX_SZ 32
|
|
+#define IONIC_INTR_INDEX_NOT_ASSIGNED -1
|
|
+#define IONIC_INTR_NAME_MAX_SZ 32
|
|
|
|
struct ionic_intr_info {
|
|
- char name[INTR_NAME_MAX_SZ];
|
|
+ char name[IONIC_INTR_NAME_MAX_SZ];
|
|
unsigned int index;
|
|
unsigned int vector;
|
|
u64 rearm_count;
|
|
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
|
|
index 170e72f31197..f7e3ce3de04d 100644
|
|
--- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
|
|
+++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
|
|
@@ -12,10 +12,11 @@
|
|
#include "ionic_stats.h"
|
|
|
|
static const char ionic_priv_flags_strings[][ETH_GSTRING_LEN] = {
|
|
-#define PRIV_F_SW_DBG_STATS BIT(0)
|
|
+#define IONIC_PRIV_F_SW_DBG_STATS BIT(0)
|
|
"sw-dbg-stats",
|
|
};
|
|
-#define PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings)
|
|
+
|
|
+#define IONIC_PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings)
|
|
|
|
static void ionic_get_stats_strings(struct ionic_lif *lif, u8 *buf)
|
|
{
|
|
@@ -58,7 +59,7 @@ static int ionic_get_sset_count(struct net_device *netdev, int sset)
|
|
count = ionic_get_stats_count(lif);
|
|
break;
|
|
case ETH_SS_PRIV_FLAGS:
|
|
- count = PRIV_FLAGS_COUNT;
|
|
+ count = IONIC_PRIV_FLAGS_COUNT;
|
|
break;
|
|
}
|
|
return count;
|
|
@@ -75,7 +76,7 @@ static void ionic_get_strings(struct net_device *netdev,
|
|
break;
|
|
case ETH_SS_PRIV_FLAGS:
|
|
memcpy(buf, ionic_priv_flags_strings,
|
|
- PRIV_FLAGS_COUNT * ETH_GSTRING_LEN);
|
|
+ IONIC_PRIV_FLAGS_COUNT * ETH_GSTRING_LEN);
|
|
break;
|
|
}
|
|
}
|
|
@@ -557,7 +558,7 @@ static u32 ionic_get_priv_flags(struct net_device *netdev)
|
|
u32 priv_flags = 0;
|
|
|
|
if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))
|
|
- priv_flags |= PRIV_F_SW_DBG_STATS;
|
|
+ priv_flags |= IONIC_PRIV_F_SW_DBG_STATS;
|
|
|
|
return priv_flags;
|
|
}
|
|
@@ -567,7 +568,7 @@ static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags)
|
|
struct ionic_lif *lif = netdev_priv(netdev);
|
|
|
|
clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);
|
|
- if (priv_flags & PRIV_F_SW_DBG_STATS)
|
|
+ if (priv_flags & IONIC_PRIV_F_SW_DBG_STATS)
|
|
set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);
|
|
|
|
return 0;
|
|
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
index d52928ea539d..e47da3127bf3 100644
|
|
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
@@ -199,7 +199,7 @@ static int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
|
|
|
|
static void ionic_intr_free(struct ionic *ionic, int index)
|
|
{
|
|
- if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs)
|
|
+ if (index != IONIC_INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs)
|
|
clear_bit(index, ionic->intrs);
|
|
}
|
|
|
|
@@ -455,7 +455,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
|
|
cpumask_set_cpu(new->intr.cpu,
|
|
&new->intr.affinity_mask);
|
|
} else {
|
|
- new->intr.index = INTR_INDEX_NOT_ASSIGNED;
|
|
+ new->intr.index = IONIC_INTR_INDEX_NOT_ASSIGNED;
|
|
}
|
|
|
|
new->cq.info = devm_kzalloc(dev, sizeof(*new->cq.info) * num_descs,
|
|
--
|
|
2.16.4
|
|
|
|
|