diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:37:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:37:49 -0500 |
commit | 454d7c9b14e20fd1949e2686e9de4a2926e01476 (patch) | |
tree | fae8bd1bfb5fd496977a0639ad71c54a2ee278ae /drivers/net/arcnet/capmode.c | |
parent | 7a12122c7a00347da9669cfcde82954c9e3d6f5e (diff) |
netdevice: safe convert to netdev_priv() #part-1
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/arcnet/capmode.c')
-rw-r--r-- | drivers/net/arcnet/capmode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c index 67bc47aa6904..e544953d8e9a 100644 --- a/drivers/net/arcnet/capmode.c +++ b/drivers/net/arcnet/capmode.c | |||
@@ -103,7 +103,7 @@ MODULE_LICENSE("GPL"); | |||
103 | static void rx(struct net_device *dev, int bufnum, | 103 | static void rx(struct net_device *dev, int bufnum, |
104 | struct archdr *pkthdr, int length) | 104 | struct archdr *pkthdr, int length) |
105 | { | 105 | { |
106 | struct arcnet_local *lp = (struct arcnet_local *) dev->priv; | 106 | struct arcnet_local *lp = netdev_priv(dev); |
107 | struct sk_buff *skb; | 107 | struct sk_buff *skb; |
108 | struct archdr *pkt = pkthdr; | 108 | struct archdr *pkt = pkthdr; |
109 | char *pktbuf, *pkthdrbuf; | 109 | char *pktbuf, *pkthdrbuf; |
@@ -197,7 +197,7 @@ static int build_header(struct sk_buff *skb, | |||
197 | static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, | 197 | static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, |
198 | int bufnum) | 198 | int bufnum) |
199 | { | 199 | { |
200 | struct arcnet_local *lp = (struct arcnet_local *) dev->priv; | 200 | struct arcnet_local *lp = netdev_priv(dev); |
201 | struct arc_hardware *hard = &pkt->hard; | 201 | struct arc_hardware *hard = &pkt->hard; |
202 | int ofs; | 202 | int ofs; |
203 | 203 | ||
@@ -249,7 +249,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, | |||
249 | 249 | ||
250 | static int ack_tx(struct net_device *dev, int acked) | 250 | static int ack_tx(struct net_device *dev, int acked) |
251 | { | 251 | { |
252 | struct arcnet_local *lp = (struct arcnet_local *) dev->priv; | 252 | struct arcnet_local *lp = netdev_priv(dev); |
253 | struct sk_buff *ackskb; | 253 | struct sk_buff *ackskb; |
254 | struct archdr *ackpkt; | 254 | struct archdr *ackpkt; |
255 | int length=sizeof(struct arc_cap); | 255 | int length=sizeof(struct arc_cap); |