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/rfc1201.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/rfc1201.c')
-rw-r--r-- | drivers/net/arcnet/rfc1201.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c index 962641e96450..2303d3a1f4b6 100644 --- a/drivers/net/arcnet/rfc1201.c +++ b/drivers/net/arcnet/rfc1201.c | |||
@@ -92,7 +92,7 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) | |||
92 | { | 92 | { |
93 | struct archdr *pkt = (struct archdr *) skb->data; | 93 | struct archdr *pkt = (struct archdr *) skb->data; |
94 | struct arc_rfc1201 *soft = &pkt->soft.rfc1201; | 94 | struct arc_rfc1201 *soft = &pkt->soft.rfc1201; |
95 | struct arcnet_local *lp = dev->priv; | 95 | struct arcnet_local *lp = netdev_priv(dev); |
96 | int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE; | 96 | int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE; |
97 | 97 | ||
98 | /* Pull off the arcnet header. */ | 98 | /* Pull off the arcnet header. */ |
@@ -134,7 +134,7 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) | |||
134 | static void rx(struct net_device *dev, int bufnum, | 134 | static void rx(struct net_device *dev, int bufnum, |
135 | struct archdr *pkthdr, int length) | 135 | struct archdr *pkthdr, int length) |
136 | { | 136 | { |
137 | struct arcnet_local *lp = dev->priv; | 137 | struct arcnet_local *lp = netdev_priv(dev); |
138 | struct sk_buff *skb; | 138 | struct sk_buff *skb; |
139 | struct archdr *pkt = pkthdr; | 139 | struct archdr *pkt = pkthdr; |
140 | struct arc_rfc1201 *soft = &pkthdr->soft.rfc1201; | 140 | struct arc_rfc1201 *soft = &pkthdr->soft.rfc1201; |
@@ -374,7 +374,7 @@ static void rx(struct net_device *dev, int bufnum, | |||
374 | static int build_header(struct sk_buff *skb, struct net_device *dev, | 374 | static int build_header(struct sk_buff *skb, struct net_device *dev, |
375 | unsigned short type, uint8_t daddr) | 375 | unsigned short type, uint8_t daddr) |
376 | { | 376 | { |
377 | struct arcnet_local *lp = dev->priv; | 377 | struct arcnet_local *lp = netdev_priv(dev); |
378 | int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE; | 378 | int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE; |
379 | struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); | 379 | struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); |
380 | struct arc_rfc1201 *soft = &pkt->soft.rfc1201; | 380 | struct arc_rfc1201 *soft = &pkt->soft.rfc1201; |
@@ -441,7 +441,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, | |||
441 | static void load_pkt(struct net_device *dev, struct arc_hardware *hard, | 441 | static void load_pkt(struct net_device *dev, struct arc_hardware *hard, |
442 | struct arc_rfc1201 *soft, int softlen, int bufnum) | 442 | struct arc_rfc1201 *soft, int softlen, int bufnum) |
443 | { | 443 | { |
444 | struct arcnet_local *lp = dev->priv; | 444 | struct arcnet_local *lp = netdev_priv(dev); |
445 | int ofs; | 445 | int ofs; |
446 | 446 | ||
447 | /* assume length <= XMTU: someone should have handled that by now. */ | 447 | /* assume length <= XMTU: someone should have handled that by now. */ |
@@ -474,7 +474,7 @@ static void load_pkt(struct net_device *dev, struct arc_hardware *hard, | |||
474 | static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, | 474 | static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, |
475 | int bufnum) | 475 | int bufnum) |
476 | { | 476 | { |
477 | struct arcnet_local *lp = dev->priv; | 477 | struct arcnet_local *lp = netdev_priv(dev); |
478 | const int maxsegsize = XMTU - RFC1201_HDR_SIZE; | 478 | const int maxsegsize = XMTU - RFC1201_HDR_SIZE; |
479 | struct Outgoing *out; | 479 | struct Outgoing *out; |
480 | 480 | ||
@@ -509,7 +509,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, | |||
509 | 509 | ||
510 | static int continue_tx(struct net_device *dev, int bufnum) | 510 | static int continue_tx(struct net_device *dev, int bufnum) |
511 | { | 511 | { |
512 | struct arcnet_local *lp = dev->priv; | 512 | struct arcnet_local *lp = netdev_priv(dev); |
513 | struct Outgoing *out = &lp->outgoing; | 513 | struct Outgoing *out = &lp->outgoing; |
514 | struct arc_hardware *hard = &out->pkt->hard; | 514 | struct arc_hardware *hard = &out->pkt->hard; |
515 | struct arc_rfc1201 *soft = &out->pkt->soft.rfc1201, *newsoft; | 515 | struct arc_rfc1201 *soft = &out->pkt->soft.rfc1201, *newsoft; |