diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:38:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:38:14 -0500 |
commit | 4cf1653aa90c6320dc8032443b5e322820aa28b1 (patch) | |
tree | 7920008d3f953defdcda8c81d39da963290d93ad /drivers/net/pasemi_mac_ethtool.c | |
parent | 454d7c9b14e20fd1949e2686e9de4a2926e01476 (diff) |
netdevice: safe convert to netdev_priv() #part-2
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>
Diffstat (limited to 'drivers/net/pasemi_mac_ethtool.c')
-rw-r--r-- | drivers/net/pasemi_mac_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/pasemi_mac_ethtool.c index 5e8df3afea64..064a4fe1dd90 100644 --- a/drivers/net/pasemi_mac_ethtool.c +++ b/drivers/net/pasemi_mac_ethtool.c | |||
@@ -109,7 +109,7 @@ static void | |||
109 | pasemi_mac_ethtool_get_ringparam(struct net_device *netdev, | 109 | pasemi_mac_ethtool_get_ringparam(struct net_device *netdev, |
110 | struct ethtool_ringparam *ering) | 110 | struct ethtool_ringparam *ering) |
111 | { | 111 | { |
112 | struct pasemi_mac *mac = netdev->priv; | 112 | struct pasemi_mac *mac = netdev_priv(netdev); |
113 | 113 | ||
114 | ering->tx_max_pending = TX_RING_SIZE/2; | 114 | ering->tx_max_pending = TX_RING_SIZE/2; |
115 | ering->tx_pending = RING_USED(mac->tx)/2; | 115 | ering->tx_pending = RING_USED(mac->tx)/2; |
@@ -130,7 +130,7 @@ static int pasemi_mac_get_sset_count(struct net_device *netdev, int sset) | |||
130 | static void pasemi_mac_get_ethtool_stats(struct net_device *netdev, | 130 | static void pasemi_mac_get_ethtool_stats(struct net_device *netdev, |
131 | struct ethtool_stats *stats, u64 *data) | 131 | struct ethtool_stats *stats, u64 *data) |
132 | { | 132 | { |
133 | struct pasemi_mac *mac = netdev->priv; | 133 | struct pasemi_mac *mac = netdev_priv(netdev); |
134 | int i; | 134 | int i; |
135 | 135 | ||
136 | data[0] = pasemi_read_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if)) | 136 | data[0] = pasemi_read_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if)) |