lkml.org 
[lkml]   [2018]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 070/168] net: hns3: Fix an error macro definition of HNS3_TQP_STAT
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jian Shen <shenjian15@huawei.com>


    [ 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 <shenjian15@huawei.com>
    Signed-off-by: Peng Li <lipeng321@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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
    @@ -23,7 +23,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[] = {

    \
     
     \ /
      Last update: 2018-04-11 01:30    [W:4.888 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site