diff options
Diffstat (limited to 'drivers/net/depca.c')
-rw-r--r-- | drivers/net/depca.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index 357f565851ed..97ea2d6d3fe1 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -810,7 +810,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
810 | 810 | ||
811 | dev->mem_start = 0; | 811 | dev->mem_start = 0; |
812 | 812 | ||
813 | device->driver_data = dev; | 813 | dev_set_drvdata(device, dev); |
814 | SET_NETDEV_DEV (dev, device); | 814 | SET_NETDEV_DEV (dev, device); |
815 | 815 | ||
816 | status = register_netdev(dev); | 816 | status = register_netdev(dev); |
@@ -957,7 +957,7 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
957 | if (TX_BUFFS_AVAIL) | 957 | if (TX_BUFFS_AVAIL) |
958 | netif_start_queue(dev); | 958 | netif_start_queue(dev); |
959 | } else | 959 | } else |
960 | status = -1; | 960 | status = NETDEV_TX_LOCKED; |
961 | 961 | ||
962 | out: | 962 | out: |
963 | return status; | 963 | return status; |
@@ -1614,7 +1614,7 @@ static int __devexit depca_device_remove (struct device *device) | |||
1614 | struct depca_private *lp; | 1614 | struct depca_private *lp; |
1615 | int bus; | 1615 | int bus; |
1616 | 1616 | ||
1617 | dev = device->driver_data; | 1617 | dev = dev_get_drvdata(device); |
1618 | lp = netdev_priv(dev); | 1618 | lp = netdev_priv(dev); |
1619 | 1619 | ||
1620 | unregister_netdev (dev); | 1620 | unregister_netdev (dev); |
@@ -1839,7 +1839,7 @@ static int load_packet(struct net_device *dev, struct sk_buff *skb) | |||
1839 | 1839 | ||
1840 | lp->tx_new = (++end) & lp->txRingMask; /* update current pointers */ | 1840 | lp->tx_new = (++end) & lp->txRingMask; /* update current pointers */ |
1841 | } else { | 1841 | } else { |
1842 | status = -1; | 1842 | status = NETDEV_TX_LOCKED; |
1843 | } | 1843 | } |
1844 | 1844 | ||
1845 | return status; | 1845 | return status; |