diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:38:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:38:36 -0500 |
commit | 8f15ea42b64941001a401cf855a0869e24f3a845 (patch) | |
tree | 27c7534ad70ebda6986491daeac0ebe0f1ca54ed /drivers/net/spider_net_ethtool.c | |
parent | 4cf1653aa90c6320dc8032443b5e322820aa28b1 (diff) |
netdevice: safe convert to netdev_priv() #part-3
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/spider_net_ethtool.c')
-rw-r--r-- | drivers/net/spider_net_ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c index 85691d2a0be2..5bae728c3820 100644 --- a/drivers/net/spider_net_ethtool.c +++ b/drivers/net/spider_net_ethtool.c | |||
@@ -118,7 +118,7 @@ spider_net_ethtool_nway_reset(struct net_device *netdev) | |||
118 | static u32 | 118 | static u32 |
119 | spider_net_ethtool_get_rx_csum(struct net_device *netdev) | 119 | spider_net_ethtool_get_rx_csum(struct net_device *netdev) |
120 | { | 120 | { |
121 | struct spider_net_card *card = netdev->priv; | 121 | struct spider_net_card *card = netdev_priv(netdev); |
122 | 122 | ||
123 | return card->options.rx_csum; | 123 | return card->options.rx_csum; |
124 | } | 124 | } |
@@ -126,7 +126,7 @@ spider_net_ethtool_get_rx_csum(struct net_device *netdev) | |||
126 | static int | 126 | static int |
127 | spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n) | 127 | spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n) |
128 | { | 128 | { |
129 | struct spider_net_card *card = netdev->priv; | 129 | struct spider_net_card *card = netdev_priv(netdev); |
130 | 130 | ||
131 | card->options.rx_csum = n; | 131 | card->options.rx_csum = n; |
132 | return 0; | 132 | return 0; |
@@ -137,7 +137,7 @@ static void | |||
137 | spider_net_ethtool_get_ringparam(struct net_device *netdev, | 137 | spider_net_ethtool_get_ringparam(struct net_device *netdev, |
138 | struct ethtool_ringparam *ering) | 138 | struct ethtool_ringparam *ering) |
139 | { | 139 | { |
140 | struct spider_net_card *card = netdev->priv; | 140 | struct spider_net_card *card = netdev_priv(netdev); |
141 | 141 | ||
142 | ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX; | 142 | ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX; |
143 | ering->tx_pending = card->tx_chain.num_desc; | 143 | ering->tx_pending = card->tx_chain.num_desc; |
@@ -158,7 +158,7 @@ static int spider_net_get_sset_count(struct net_device *netdev, int sset) | |||
158 | static void spider_net_get_ethtool_stats(struct net_device *netdev, | 158 | static void spider_net_get_ethtool_stats(struct net_device *netdev, |
159 | struct ethtool_stats *stats, u64 *data) | 159 | struct ethtool_stats *stats, u64 *data) |
160 | { | 160 | { |
161 | struct spider_net_card *card = netdev->priv; | 161 | struct spider_net_card *card = netdev_priv(netdev); |
162 | 162 | ||
163 | data[0] = netdev->stats.tx_packets; | 163 | data[0] = netdev->stats.tx_packets; |
164 | data[1] = netdev->stats.tx_bytes; | 164 | data[1] = netdev->stats.tx_bytes; |