diff options
author | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:12:04 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:12:04 -0400 |
commit | b0e32e20e3c63778d8c20a40d8bec8b18baffecb (patch) | |
tree | 2e0c3311c53889473b94d49132fe5b7cdee71d51 /drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | |
parent | Merge branch 'misc' into k.o/for-next (diff) | |
parent | IB/uverbs: Fix NULL pointer dereference during device removal (diff) | |
download | linux-dev-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.tar.xz linux-dev-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.zip |
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_ethtool.c')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c index 98e30b41e436..8dc1e6225cc8 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c @@ -52,7 +52,8 @@ static const struct ipoib_stats ipoib_gstrings_stats[] = { IPOIB_NETDEV_STAT(tx_bytes), IPOIB_NETDEV_STAT(tx_errors), IPOIB_NETDEV_STAT(rx_dropped), - IPOIB_NETDEV_STAT(tx_dropped) + IPOIB_NETDEV_STAT(tx_dropped), + IPOIB_NETDEV_STAT(multicast), }; #define IPOIB_GLOBAL_STATS_LEN ARRAY_SIZE(ipoib_gstrings_stats) |