diff options
| author |   Tony Prisk <linux@prisktech.co.nz> | 2013-05-18 09:39:05 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-05-20 13:40:39 -0700 |
| commit | a9683c94fe8c8f87fdc8380a2e76506aa1502dcb (patch) | |
| tree | 46cfcae59a27882fa465c51c7d4790f96be33f74 /drivers/net/ethernet/via/via-velocity.h | |
| parent | 3c59x: remove useless VORTEX_PCI() invocations (diff) | |
| download | linux-dev-a9683c94fe8c8f87fdc8380a2e76506aa1502dcb.tar.xz linux-dev-a9683c94fe8c8f87fdc8380a2e76506aa1502dcb.zip | |
net: velocity: Rename vptr->dev to vptr->netdev
Improve the clarity of the code in preparation for converting the
dma functions to generic versions, which require a struct device *.
This makes it possible to store a 'struct device *dev' in the
velocity_info structure.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via/via-velocity.h')
| -rw-r--r-- | drivers/net/ethernet/via/via-velocity.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/via/via-velocity.h b/drivers/net/ethernet/via/via-velocity.h index 4cb9f13485e9..ff8d7828aa1b 100644 --- a/drivers/net/ethernet/via/via-velocity.h +++ b/drivers/net/ethernet/via/via-velocity.h @@ -1435,7 +1435,7 @@ struct velocity_opt { struct velocity_info { struct pci_dev *pdev; - struct net_device *dev; + struct net_device *netdev; unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u8 ip_addr[4]; @@ -1514,7 +1514,7 @@ static inline int velocity_get_ip(struct velocity_info *vptr) int res = -ENOENT; rcu_read_lock(); - in_dev = __in_dev_get_rcu(vptr->dev); + in_dev = __in_dev_get_rcu(vptr->netdev); if (in_dev != NULL) { ifa = (struct in_ifaddr *) in_dev->ifa_list; if (ifa != NULL) { |