diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:41 +0000 |
| commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
| tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | |
| parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
| parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
| download | blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.gz blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.zip | |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index 0780e039b271..8dee1beb9854 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c @@ -181,6 +181,7 @@ static const char ql_gstrings_test[][ETH_GSTRING_LEN] = { }; #define QLGE_TEST_LEN (sizeof(ql_gstrings_test) / ETH_GSTRING_LEN) #define QLGE_STATS_LEN ARRAY_SIZE(ql_gstrings_stats) +#define QLGE_RCV_MAC_ERR_STATS 7 static int ql_update_ring_coalescing(struct ql_adapter *qdev) { @@ -280,6 +281,9 @@ static void ql_update_stats(struct ql_adapter *qdev) iter++; } + /* Update receive mac error statistics */ + iter += QLGE_RCV_MAC_ERR_STATS; + /* * Get Per-priority TX pause frame counter statistics. */ |
