Skip to content

Commit

Permalink
qlcnic: Fix ethtool statistics collection
Browse files Browse the repository at this point in the history
o Properly fill statistics data into buffer.
  Update buffer pointer properly after filling statistics data into buffer.

Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Shahed Shaikh authored and David S. Miller committed Mar 9, 2013
1 parent 1075822 commit 9434dbf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,7 @@ qlcnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)
}
}

static void
qlcnic_fill_stats(u64 *data, void *stats, int type)
static u64 *qlcnic_fill_stats(u64 *data, void *stats, int type)
{
if (type == QLCNIC_MAC_STATS) {
struct qlcnic_mac_statistics *mac_stats =
Expand Down Expand Up @@ -1121,6 +1120,7 @@ qlcnic_fill_stats(u64 *data, void *stats, int type)
*data++ = QLCNIC_FILL_STATS(esw_stats->local_frames);
*data++ = QLCNIC_FILL_STATS(esw_stats->numbytes);
}
return data;
}

static void qlcnic_get_ethtool_stats(struct net_device *dev,
Expand Down Expand Up @@ -1148,7 +1148,7 @@ static void qlcnic_get_ethtool_stats(struct net_device *dev,
/* Retrieve MAC statistics from firmware */
memset(&mac_stats, 0, sizeof(struct qlcnic_mac_statistics));
qlcnic_get_mac_stats(adapter, &mac_stats);
qlcnic_fill_stats(data, &mac_stats, QLCNIC_MAC_STATS);
data = qlcnic_fill_stats(data, &mac_stats, QLCNIC_MAC_STATS);
}

if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
Expand All @@ -1160,7 +1160,7 @@ static void qlcnic_get_ethtool_stats(struct net_device *dev,
if (ret)
return;

qlcnic_fill_stats(data, &port_stats.rx, QLCNIC_ESW_STATS);
data = qlcnic_fill_stats(data, &port_stats.rx, QLCNIC_ESW_STATS);
ret = qlcnic_get_port_stats(adapter, adapter->ahw->pci_func,
QLCNIC_QUERY_TX_COUNTER, &port_stats.tx);
if (ret)
Expand Down

0 comments on commit 9434dbf

Please sign in to comment.