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/rfc1051.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/rfc1051.c')
-rw-r--r-- | drivers/net/arcnet/rfc1051.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c index 994be4970a57..49d39a9cb696 100644 --- a/drivers/net/arcnet/rfc1051.c +++ b/drivers/net/arcnet/rfc1051.c | |||
@@ -88,7 +88,7 @@ MODULE_LICENSE("GPL"); | |||
88 | */ | 88 | */ |
89 | static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) | 89 | static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) |
90 | { | 90 | { |
91 | struct arcnet_local *lp = dev->priv; | 91 | struct arcnet_local *lp = netdev_priv(dev); |
92 | struct archdr *pkt = (struct archdr *) skb->data; | 92 | struct archdr *pkt = (struct archdr *) skb->data; |
93 | struct arc_rfc1051 *soft = &pkt->soft.rfc1051; | 93 | struct arc_rfc1051 *soft = &pkt->soft.rfc1051; |
94 | int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE; | 94 | int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE; |
@@ -125,7 +125,7 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) | |||
125 | static void rx(struct net_device *dev, int bufnum, | 125 | static void rx(struct net_device *dev, int bufnum, |
126 | struct archdr *pkthdr, int length) | 126 | struct archdr *pkthdr, int length) |
127 | { | 127 | { |
128 | struct arcnet_local *lp = dev->priv; | 128 | struct arcnet_local *lp = netdev_priv(dev); |
129 | struct sk_buff *skb; | 129 | struct sk_buff *skb; |
130 | struct archdr *pkt = pkthdr; | 130 | struct archdr *pkt = pkthdr; |
131 | int ofs; | 131 | int ofs; |
@@ -168,7 +168,7 @@ static void rx(struct net_device *dev, int bufnum, | |||
168 | static int build_header(struct sk_buff *skb, struct net_device *dev, | 168 | static int build_header(struct sk_buff *skb, struct net_device *dev, |
169 | unsigned short type, uint8_t daddr) | 169 | unsigned short type, uint8_t daddr) |
170 | { | 170 | { |
171 | struct arcnet_local *lp = dev->priv; | 171 | struct arcnet_local *lp = netdev_priv(dev); |
172 | int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE; | 172 | int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE; |
173 | struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); | 173 | struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); |
174 | struct arc_rfc1051 *soft = &pkt->soft.rfc1051; | 174 | struct arc_rfc1051 *soft = &pkt->soft.rfc1051; |
@@ -219,7 +219,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, | |||
219 | static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, | 219 | static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, |
220 | int bufnum) | 220 | int bufnum) |
221 | { | 221 | { |
222 | struct arcnet_local *lp = dev->priv; | 222 | struct arcnet_local *lp = netdev_priv(dev); |
223 | struct arc_hardware *hard = &pkt->hard; | 223 | struct arc_hardware *hard = &pkt->hard; |
224 | int ofs; | 224 | int ofs; |
225 | 225 | ||