56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
|
|
Date: Wed, 25 Apr 2012 01:46:52 +0000
|
|
Subject: [PATCH 48/58] be2net: Fix Lancer statistics
|
|
|
|
commit d51ebd331166e102591e5c25805d8015df0e1e21 upstream.
|
|
|
|
Fix port num sent in command to get stats. Also skip unnecessary
|
|
parsing of stats for Lancer.
|
|
|
|
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +-
|
|
drivers/net/ethernet/emulex/benet/be_main.c | 5 +++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
|
|
index 3ba4aed..4e07e58 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
|
|
@@ -1221,7 +1221,7 @@ int lancer_cmd_get_pport_stats(struct be_adapter *adapter,
|
|
OPCODE_ETH_GET_PPORT_STATS, nonemb_cmd->size, wrb,
|
|
nonemb_cmd);
|
|
|
|
- req->cmd_params.params.pport_num = cpu_to_le16(adapter->port_num);
|
|
+ req->cmd_params.params.pport_num = cpu_to_le16(adapter->hba_port_num);
|
|
req->cmd_params.params.reset_stats = 0;
|
|
|
|
be_mcc_notify(adapter);
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
index 915b95e..9b1c03e 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_main.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
@@ -421,6 +421,9 @@ void be_parse_stats(struct be_adapter *adapter)
|
|
populate_be2_stats(adapter);
|
|
}
|
|
|
|
+ if (lancer_chip(adapter))
|
|
+ goto done;
|
|
+
|
|
/* as erx_v1 is longer than v0, ok to use v1 defn for v0 access */
|
|
for_all_rx_queues(adapter, rxo, i) {
|
|
/* below erx HW counter can actually wrap around after
|
|
@@ -429,6 +432,8 @@ void be_parse_stats(struct be_adapter *adapter)
|
|
accumulate_16bit_val(&rx_stats(rxo)->rx_drops_no_frags,
|
|
(u16)erx->rx_drops_no_fragments[rxo->q.id]);
|
|
}
|
|
+done:
|
|
+ return;
|
|
}
|
|
|
|
static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,
|
|
--
|
|
1.7.10
|
|
|