[PATCH 4.14 055/138] net: hns3: Fix an error macro definition of HNS3_TQP_STAT

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Jian Shen 


[ Upstream commit 57ffee737b36dbb81e8e60a37e01791553157a5e ]

The member "stats_offset" was designed to indicate the offset
of each member of struct ring_stats in struct hns3_enet_ring,
but forgot to add the offset of the member in struct ring_stats.

Fixes: 496d03e960a ("net: hns3: Add Ethtool support to HNS3 driver")
Signed-off-by: Jian Shen 
Signed-off-by: Peng Li 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
@@ -22,7 +22,8 @@ struct hns3_stats {
 #define HNS3_TQP_STAT(_string, _member){   \
.stats_string = _string,\
.stats_size = FIELD_SIZEOF(struct ring_stats, _member), \
-   .stats_offset = offsetof(struct hns3_enet_ring, stats), \
+   .stats_offset = offsetof(struct hns3_enet_ring, stats) +\
+   offsetof(struct ring_stats, _member),   \
 }  \
 
 static const struct hns3_stats hns3_txq_stats[] = {

[PATCH 4.14 055/138] net: hns3: Fix an error macro definition of HNS3_TQP_STAT

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Jian Shen 


[ Upstream commit 57ffee737b36dbb81e8e60a37e01791553157a5e ]

The member "stats_offset" was designed to indicate the offset
of each member of struct ring_stats in struct hns3_enet_ring,
but forgot to add the offset of the member in struct ring_stats.

Fixes: 496d03e960a ("net: hns3: Add Ethtool support to HNS3 driver")
Signed-off-by: Jian Shen 
Signed-off-by: Peng Li 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
@@ -22,7 +22,8 @@ struct hns3_stats {
 #define HNS3_TQP_STAT(_string, _member){   \
.stats_string = _string,\
.stats_size = FIELD_SIZEOF(struct ring_stats, _member), \
-   .stats_offset = offsetof(struct hns3_enet_ring, stats), \
+   .stats_offset = offsetof(struct hns3_enet_ring, stats) +\
+   offsetof(struct ring_stats, _member),   \
 }  \
 
 static const struct hns3_stats hns3_txq_stats[] = {