releases/4.14.34/net-hns3-fix-an-error-macro-definition-of-hns3_tqp_stat.patch

   1 From foo@baz Mon Apr  9 13:58:16 CEST 2018
   2 From: Jian Shen <shenjian15@huawei.com>
   3 Date: Fri, 5 Jan 2018 18:18:14 +0800
   4 Subject: net: hns3: Fix an error macro definition of HNS3_TQP_STAT
   5
   6 From: Jian Shen <shenjian15@huawei.com>
   7
   8
   9 [ Upstream commit 57ffee737b36dbb81e8e60a37e01791553157a5e ]
  10
  11 The member "stats_offset" was designed to indicate the offset
  12 of each member of struct ring_stats in struct hns3_enet_ring,
  13 but forgot to add the offset of the member in struct ring_stats.
  14
  15 Fixes: 496d03e960a ("net: hns3: Add Ethtool support to HNS3 driver")
  16 Signed-off-by: Jian Shen <shenjian15@huawei.com>
  17 Signed-off-by: Peng Li <lipeng321@huawei.com>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c |    3 ++-
  23  1 file changed, 2 insertions(+), 1 deletion(-)
  24
  25 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
  26 +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
  27 @@ -22,7 +22,8 @@ struct hns3_stats {
  28  #define HNS3_TQP_STAT(_string, _member)        {                       \
  29         .stats_string = _string,                                \
  30         .stats_size = FIELD_SIZEOF(struct ring_stats, _member), \
  31 -       .stats_offset = offsetof(struct hns3_enet_ring, stats), \
  32 +       .stats_offset = offsetof(struct hns3_enet_ring, stats) +\
  33 +                       offsetof(struct ring_stats, _member),   \
  34  }                                                              \
  35
  36  static const struct hns3_stats hns3_txq_stats[] = {