diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/spider_net.h | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/spider_net.h')
| -rw-r--r-- | drivers/net/spider_net.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index 30407cdf089..a59deda2f95 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h @@ -29,7 +29,7 @@ extern int spider_net_stop(struct net_device *netdev); extern int spider_net_open(struct net_device *netdev); -extern struct ethtool_ops spider_net_ethtool_ops; +extern const struct ethtool_ops spider_net_ethtool_ops; extern char spider_net_driver_name[]; @@ -415,6 +415,15 @@ struct spider_net_options { NETIF_MSG_HW | \ NETIF_MSG_WOL ) +struct spider_net_extra_stats { + unsigned long rx_desc_error; + unsigned long tx_timeouts; + unsigned long alloc_rx_skb_error; + unsigned long rx_iommu_map_error; + unsigned long tx_iommu_map_error; + unsigned long rx_desc_unk_state; +}; + struct spider_net_card { struct net_device *netdev; struct pci_dev *pdev; @@ -439,9 +448,9 @@ struct spider_net_card { /* for ethtool */ int msg_enable; - int rx_desc; int tx_desc; + struct spider_net_extra_stats spider_stats; struct spider_net_descr descr[0]; }; |