Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[pandora-kernel.git] / drivers / net / spider_net_ethtool.c

diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c
index a5bb0b7..91b9951 100644 (file)
--- a/drivers/net/spider_net_ethtool.c
+++ b/drivers/net/spider_net_ethtool.c
@@ -27,6 +27,27 @@
 
 #include "spider_net.h"
 
+
+#define SPIDER_NET_NUM_STATS 13
+
+static struct {
+       const char str[ETH_GSTRING_LEN];
+} ethtool_stats_keys[] = {
+       { "tx_packets" },
+       { "tx_bytes" },
+       { "rx_packets" },
+       { "rx_bytes" },
+       { "tx_errors" },
+       { "tx_dropped" },
+       { "rx_dropped" },
+       { "rx_descriptor_error" },
+       { "tx_timeouts" },
+       { "alloc_rx_skb_error" },
+       { "rx_iommu_map_error" },
+       { "tx_iommu_map_error" },
+       { "rx_desc_unk_state" },
+};
+
 static int
 spider_net_ethtool_get_settings(struct net_device *netdev,
                               struct ethtool_cmd *cmd)
@@ -55,7 +76,7 @@ spider_net_ethtool_get_drvinfo(struct net_device *netdev,
        /* clear and fill out info */
        memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
        strncpy(drvinfo->driver, spider_net_driver_name, 32);
-       strncpy(drvinfo->version, "0.1", 32);
+       strncpy(drvinfo->version, VERSION, 32);
        strcpy(drvinfo->fw_version, "no information");
        strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
 }
@@ -130,7 +151,50 @@ spider_net_ethtool_set_tx_csum(struct net_device *netdev, uint32_t data)
         return 0;
 }
 
-struct ethtool_ops spider_net_ethtool_ops = {
+static void
+spider_net_ethtool_get_ringparam(struct net_device *netdev,
+                                struct ethtool_ringparam *ering)
+{
+       struct spider_net_card *card = netdev->priv;
+
+       ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;
+       ering->tx_pending = card->num_tx_desc;
+       ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX;
+       ering->rx_pending = card->num_rx_desc;
+}
+
+static int spider_net_get_stats_count(struct net_device *netdev)
+{
+       return SPIDER_NET_NUM_STATS;
+}
+
+static void spider_net_get_ethtool_stats(struct net_device *netdev,
+               struct ethtool_stats *stats, u64 *data)
+{
+       struct spider_net_card *card = netdev->priv;
+
+       data[0] = card->netdev_stats.tx_packets;
+       data[1] = card->netdev_stats.tx_bytes;
+       data[2] = card->netdev_stats.rx_packets;
+       data[3] = card->netdev_stats.rx_bytes;
+       data[4] = card->netdev_stats.tx_errors;
+       data[5] = card->netdev_stats.tx_dropped;
+       data[6] = card->netdev_stats.rx_dropped;
+       data[7] = card->spider_stats.rx_desc_error;
+       data[8] = card->spider_stats.tx_timeouts;
+       data[9] = card->spider_stats.alloc_rx_skb_error;
+       data[10] = card->spider_stats.rx_iommu_map_error;
+       data[11] = card->spider_stats.tx_iommu_map_error;
+       data[12] = card->spider_stats.rx_desc_unk_state;
+}
+
+static void spider_net_get_strings(struct net_device *netdev, u32 stringset,
+                                  u8 *data)
+{
+       memcpy(data, ethtool_stats_keys, sizeof(ethtool_stats_keys));
+}
+
+const struct ethtool_ops spider_net_ethtool_ops = {
        .get_settings           = spider_net_ethtool_get_settings,
        .get_drvinfo            = spider_net_ethtool_get_drvinfo,
        .get_wol                = spider_net_ethtool_get_wol,
@@ -141,5 +205,9 @@ struct ethtool_ops spider_net_ethtool_ops = {
        .set_rx_csum            = spider_net_ethtool_set_rx_csum,
        .get_tx_csum            = spider_net_ethtool_get_tx_csum,
        .set_tx_csum            = spider_net_ethtool_set_tx_csum,
+       .get_ringparam          = spider_net_ethtool_get_ringparam,
+       .get_strings            = spider_net_get_strings,
+       .get_stats_count        = spider_net_get_stats_count,
+       .get_ethtool_stats      = spider_net_get_ethtool_stats,
 };