cxgb4vf: Prefix adapter flags with CXGB4VF
Subsystems (3)
PATCH 1/1 cxgb4vf: Prefix adapter flags with CXGB4VF
Some of these macros were conflicting with global namespace, hence prefixing them with CXGB4VF.
Signed-off-by Arjun Vynipadath <[email protected]>
Signed-off-by Vishal Kulkarni <[email protected]>
--- drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 12 ++-- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 68 +++++++++++----------- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 10 ++-- 3 files changed, 47 insertions(+), 43 deletions(-)
drivers/net/ethernet/chelsio/cxgb4vf/adapter.h +6 -6
@@ -406,12 +406,12 @@ struct adapter { };enum {/* adapter flags */ -FULL_INIT_DONE = (1UL <<0 ), -USING_MSI = (1UL <<1 ), -USING_MSIX = (1UL <<2 ), -QUEUES_BOUND = (1UL <<3 ), -ROOT_NO_RELAXED_ORDERING = (1UL <<4 ), -FW_OK = (1UL <<5 ), +CXGB4VF_FULL_INIT_DONE = (1UL <<0 ), +CXGB4VF_USING_MSI = (1UL <<1 ), +CXGB4VF_USING_MSIX = (1UL <<2 ), +CXGB4VF_QUEUES_BOUND = (1UL <<3 ), +CXGB4VF_ROOT_NO_RELAXED_ORDERING = (1UL <<4 ), +CXGB4VF_FW_OK = (1UL <<5 ), };/*
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +35 -33
201 lines not on this page · raw message
drivers/net/ethernet/chelsio/cxgb4vf/sge.c +6 -4
@@ -2044,8 +2044,9 @@ static irqreturn_t t4vf_intr_msi(int irq, void *cookie)*/ irq_handler_t t4vf_intr_handler (struct adapter *adapter) { -BUG_ON ((adapter->flags & (USING_MSIX |USING_MSI )) ==0 ); -if (adapter->flags &USING_MSIX ) +BUG_ON ((adapter->flags & + (CXGB4VF_USING_MSIX |CXGB4VF_USING_MSI )) ==0 ); +if (adapter->flags &CXGB4VF_USING_MSIX )return t4vf_sge_intr_msix;else return t4vf_intr_msi;
@@ -2209,7 +2210,7 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,struct port_info *pi =netdev_priv (dev);struct fw_iq_cmd cmd, rpl;int ret, iqandst, flsz =0 ; -int relaxed = !(adapter->flags &ROOT_NO_RELAXED_ORDERING ); +int relaxed = !(adapter->flags &CXGB4VF_ROOT_NO_RELAXED_ORDERING );/* * If we're using MSI interrupts and we're not initializing the
@@ -2218,7 +2219,8 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,* the Forwarded Interrupt Queue must be set up before any other * ingress queue ... */ -if ((adapter->flags &USING_MSI ) && rspq != &adapter->sge.intrq) { +if ((adapter->flags &CXGB4VF_USING_MSI ) && + rspq != &adapter->sge.intrq) { iqandst =SGE_INTRDST_IQ ; intr_dest = adapter->sge.intrq.abs_id; }else
Signature · 1 line
2.9.5
From: Arjun Vynipadath <[email protected]>
Date: Fri, 1 Mar 2019 15:42:39 +0530
Quoted 5 lines
Some of these macros were conflicting with global namespace, hence prefixing them with CXGB4VF.
Signed-off-by Arjun Vynipadath <[email protected]>Signed-off-by Vishal Kulkarni <[email protected]>
Applied.