We have some reasons to kill netdev->priv: 1. netdev->priv is equal to netdev_priv(). 2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously netdev_priv() is more flexible than netdev->priv. But we cann't kill netdev->priv, because so many drivers reference to it directly. This patch is a safe convert for netdev->priv to netdev_priv(netdev). Since all of the netdev->priv is only for read. But it is too big to be sent in one mail. I split it to 4 parts and make every part smaller than 100,000 bytes, which is max size allowed by vger. Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			200 lines
		
	
	
	
		
			5.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			200 lines
		
	
	
	
		
			5.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Network device driver for Cell Processor-Based Blade
 | 
						|
 *
 | 
						|
 * (C) Copyright IBM Corp. 2005
 | 
						|
 *
 | 
						|
 * Authors : Utz Bacher <utz.bacher@de.ibm.com>
 | 
						|
 *           Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2, or (at your option)
 | 
						|
 * any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/netdevice.h>
 | 
						|
#include <linux/ethtool.h>
 | 
						|
#include <linux/pci.h>
 | 
						|
 | 
						|
#include "spider_net.h"
 | 
						|
 | 
						|
 | 
						|
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)
 | 
						|
{
 | 
						|
	struct spider_net_card *card;
 | 
						|
	card = netdev_priv(netdev);
 | 
						|
 | 
						|
	cmd->supported   = (SUPPORTED_1000baseT_Full |
 | 
						|
			     SUPPORTED_FIBRE);
 | 
						|
	cmd->advertising = (ADVERTISED_1000baseT_Full |
 | 
						|
			     ADVERTISED_FIBRE);
 | 
						|
	cmd->port = PORT_FIBRE;
 | 
						|
	cmd->speed = card->phy.speed;
 | 
						|
	cmd->duplex = DUPLEX_FULL;
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
spider_net_ethtool_get_drvinfo(struct net_device *netdev,
 | 
						|
			       struct ethtool_drvinfo *drvinfo)
 | 
						|
{
 | 
						|
	struct spider_net_card *card;
 | 
						|
	card = netdev_priv(netdev);
 | 
						|
 | 
						|
	/* clear and fill out info */
 | 
						|
	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
 | 
						|
	strncpy(drvinfo->driver, spider_net_driver_name, 32);
 | 
						|
	strncpy(drvinfo->version, VERSION, 32);
 | 
						|
	strcpy(drvinfo->fw_version, "no information");
 | 
						|
	strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
spider_net_ethtool_get_wol(struct net_device *netdev,
 | 
						|
			   struct ethtool_wolinfo *wolinfo)
 | 
						|
{
 | 
						|
	/* no support for wol */
 | 
						|
	wolinfo->supported = 0;
 | 
						|
	wolinfo->wolopts = 0;
 | 
						|
}
 | 
						|
 | 
						|
static u32
 | 
						|
spider_net_ethtool_get_msglevel(struct net_device *netdev)
 | 
						|
{
 | 
						|
	struct spider_net_card *card;
 | 
						|
	card = netdev_priv(netdev);
 | 
						|
	return card->msg_enable;
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
spider_net_ethtool_set_msglevel(struct net_device *netdev,
 | 
						|
				u32 level)
 | 
						|
{
 | 
						|
	struct spider_net_card *card;
 | 
						|
	card = netdev_priv(netdev);
 | 
						|
	card->msg_enable = level;
 | 
						|
}
 | 
						|
 | 
						|
static int
 | 
						|
spider_net_ethtool_nway_reset(struct net_device *netdev)
 | 
						|
{
 | 
						|
	if (netif_running(netdev)) {
 | 
						|
		spider_net_stop(netdev);
 | 
						|
		spider_net_open(netdev);
 | 
						|
	}
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static u32
 | 
						|
spider_net_ethtool_get_rx_csum(struct net_device *netdev)
 | 
						|
{
 | 
						|
	struct spider_net_card *card = netdev_priv(netdev);
 | 
						|
 | 
						|
	return card->options.rx_csum;
 | 
						|
}
 | 
						|
 | 
						|
static int
 | 
						|
spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
 | 
						|
{
 | 
						|
	struct spider_net_card *card = netdev_priv(netdev);
 | 
						|
 | 
						|
	card->options.rx_csum = n;
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
static void
 | 
						|
spider_net_ethtool_get_ringparam(struct net_device *netdev,
 | 
						|
				 struct ethtool_ringparam *ering)
 | 
						|
{
 | 
						|
	struct spider_net_card *card = netdev_priv(netdev);
 | 
						|
 | 
						|
	ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;
 | 
						|
	ering->tx_pending = card->tx_chain.num_desc;
 | 
						|
	ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX;
 | 
						|
	ering->rx_pending = card->rx_chain.num_desc;
 | 
						|
}
 | 
						|
 | 
						|
static int spider_net_get_sset_count(struct net_device *netdev, int sset)
 | 
						|
{
 | 
						|
	switch (sset) {
 | 
						|
	case ETH_SS_STATS:
 | 
						|
		return ARRAY_SIZE(ethtool_stats_keys);
 | 
						|
	default:
 | 
						|
		return -EOPNOTSUPP;
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void spider_net_get_ethtool_stats(struct net_device *netdev,
 | 
						|
		struct ethtool_stats *stats, u64 *data)
 | 
						|
{
 | 
						|
	struct spider_net_card *card = netdev_priv(netdev);
 | 
						|
 | 
						|
	data[0] = netdev->stats.tx_packets;
 | 
						|
	data[1] = netdev->stats.tx_bytes;
 | 
						|
	data[2] = netdev->stats.rx_packets;
 | 
						|
	data[3] = netdev->stats.rx_bytes;
 | 
						|
	data[4] = netdev->stats.tx_errors;
 | 
						|
	data[5] = netdev->stats.tx_dropped;
 | 
						|
	data[6] = 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,
 | 
						|
	.get_msglevel		= spider_net_ethtool_get_msglevel,
 | 
						|
	.set_msglevel		= spider_net_ethtool_set_msglevel,
 | 
						|
	.get_link		= ethtool_op_get_link,
 | 
						|
	.nway_reset		= spider_net_ethtool_nway_reset,
 | 
						|
	.get_rx_csum		= spider_net_ethtool_get_rx_csum,
 | 
						|
	.set_rx_csum		= spider_net_ethtool_set_rx_csum,
 | 
						|
	.set_tx_csum		= ethtool_op_set_tx_csum,
 | 
						|
	.get_ringparam          = spider_net_ethtool_get_ringparam,
 | 
						|
	.get_strings		= spider_net_get_strings,
 | 
						|
	.get_sset_count		= spider_net_get_sset_count,
 | 
						|
	.get_ethtool_stats	= spider_net_get_ethtool_stats,
 | 
						|
};
 | 
						|
 |