cxgb4/cxgb4vf: Cleanup macros, add comments and add new MACROS

Cleanup few MACROS left out in t4_hw.h to be consistent with the
existing ones. Also replace few hardcoded values with MACROS. Also
update comments for some code

Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
index 10d82b5..401272a 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
@@ -578,7 +578,7 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
        const struct sge_rspq *rq = &adap->sge.ethrxq[pi->first_qset].rspq;
 
        c->rx_coalesce_usecs = qtimer_val(adap, rq);
-       c->rx_max_coalesced_frames = (rq->intr_params & QINTR_CNT_EN) ?
+       c->rx_max_coalesced_frames = (rq->intr_params & QINTR_CNT_EN_F) ?
                adap->sge.counter_val[rq->pktcnt_idx] : 0;
        c->use_adaptive_rx_coalesce = get_adaptive_rx_setting(dev);
        return 0;

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_values.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c
Simple merge