be2net: Fix Lancer statistics

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>

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 6a2fad394cbe81e69110bffc847e5662fe7a123d..3bc0b4b4030f348a874deb2cf9ae2c122b09b544 100644 (file)
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1226,7 +1226,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/benet/be_main.c b/drivers/net/benet/be_main.c
index 70d8b9eb3e8f3f597a86e5812c0afbaaae77ff58..bd707e82705100b14b4bd94cc3b459f8f6ecb44b 100644 (file)
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -417,6 +417,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
@@ -425,6 +428,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,