net: velocity: Convert to generic dma functions

[mirror_ubuntu-zesty-kernel.git] / drivers / net / ethernet / via / via-velocity.h

diff --git a/drivers/net/ethernet/via/via-velocity.h b/drivers/net/ethernet/via/via-velocity.h
index 4cb9f13485e957c2a510976841ac07023e774457..c38bbaed4d126edc4212747f9f9b71af86afc89a 100644 (file)
--- a/drivers/net/ethernet/via/via-velocity.h
+++ b/drivers/net/ethernet/via/via-velocity.h
@@ -1434,8 +1434,9 @@ struct velocity_opt {
 #define GET_RD_BY_IDX(vptr, idx)   (vptr->rd_ring[idx])
 
 struct velocity_info {
+       struct device *dev;
        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 +1515,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) {