diff options
| author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 10:38:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-13 10:38:36 +0300 |
| commit | 8f15ea42b64941001a401cf855a0869e24f3a845 (patch) | |
| tree | 27c7534ad70ebda6986491daeac0ebe0f1ca54ed /drivers/net/smc9194.c | |
| parent | 4cf1653aa90c6320dc8032443b5e322820aa28b1 (diff) | |
| download | linux-8f15ea42b64941001a401cf855a0869e24f3a845.tar.xz | |
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/smc9194.c')
| -rw-r--r-- | drivers/net/smc9194.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index e35fab1da6a4..e7cc80f32560 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c @@ -1034,7 +1034,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) printk("ADDR: %pM\n", dev->dev_addr); /* set the private data to zero by default */ - memset(dev->priv, 0, sizeof(struct smc_local)); + memset(netdev_priv(dev), 0, sizeof(struct smc_local)); /* Grab the IRQ */ retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev); @@ -1108,7 +1108,7 @@ static int smc_open(struct net_device *dev) int i; /* used to set hw ethernet address */ /* clear out all the junk that was put here before... */ - memset(dev->priv, 0, sizeof(struct smc_local)); + memset(netdev_priv(dev), 0, sizeof(struct smc_local)); /* reset the hardware */ @@ -1164,7 +1164,7 @@ static void smc_timeout(struct net_device *dev) smc_enable( dev->base_addr ); dev->trans_start = jiffies; /* clear anything saved */ - ((struct smc_local *)dev->priv)->saved_skb = NULL; + ((struct smc_local *)netdev_priv(dev))->saved_skb = NULL; netif_wake_queue(dev); } |