Merge tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[deliverable/linux.git] / drivers / net / ethernet / emulex / benet / be_ethtool.c

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index c4662db825b0fc9c7d30860374f5447627fe36c2..3d4461adb3b4194eef3fe2dca339650665dac97b 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -85,6 +85,7 @@ static const struct be_ethtool_stat et_stats[] = {
        {DRVSTAT_INFO(tx_pauseframes)},
        {DRVSTAT_INFO(tx_controlframes)},
        {DRVSTAT_INFO(rx_priority_pause_frames)},
+       {DRVSTAT_INFO(tx_priority_pauseframes)},
        /* Received packets dropped when an internal fifo going into
         * main packet buffer tank (PMEM) overflows.
         */
@@ -680,7 +681,8 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 
        if (be_is_wol_supported(adapter)) {
                wol->supported |= WAKE_MAGIC;
-               wol->wolopts |= WAKE_MAGIC;
+               if (adapter->wol)
+                       wol->wolopts |= WAKE_MAGIC;
        } else
                wol->wolopts = 0;
        memset(&wol->sopass, 0, sizeof(wol->sopass));
@@ -755,6 +757,12 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
        int status;
        u8 link_status = 0;
 
+       if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) {
+               dev_err(&adapter->pdev->dev, "Self test not supported\n");
+               test->flags |= ETH_TEST_FL_FAILED;
+               return;
+       }
+
        memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM);
 
        if (test->flags & ETH_TEST_FL_OFFLINE) {