diff options
Diffstat (limited to 'drivers/net/irda/ali-ircc.c')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 2ff181861d2d..3c58e67ef1e4 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -292,7 +292,7 @@ static int ali_ircc_open(int i, chipio_t *info) | |||
292 | return -ENOMEM; | 292 | return -ENOMEM; |
293 | } | 293 | } |
294 | 294 | ||
295 | self = dev->priv; | 295 | self = netdev_priv(dev); |
296 | self->netdev = dev; | 296 | self->netdev = dev; |
297 | spin_lock_init(&self->lock); | 297 | spin_lock_init(&self->lock); |
298 | 298 | ||
@@ -665,7 +665,7 @@ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id) | |||
665 | 665 | ||
666 | IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__); | 666 | IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__); |
667 | 667 | ||
668 | self = dev->priv; | 668 | self = netdev_priv(dev); |
669 | 669 | ||
670 | spin_lock(&self->lock); | 670 | spin_lock(&self->lock); |
671 | 671 | ||
@@ -1333,7 +1333,7 @@ static int ali_ircc_net_open(struct net_device *dev) | |||
1333 | 1333 | ||
1334 | IRDA_ASSERT(dev != NULL, return -1;); | 1334 | IRDA_ASSERT(dev != NULL, return -1;); |
1335 | 1335 | ||
1336 | self = (struct ali_ircc_cb *) dev->priv; | 1336 | self = netdev_priv(dev); |
1337 | 1337 | ||
1338 | IRDA_ASSERT(self != NULL, return 0;); | 1338 | IRDA_ASSERT(self != NULL, return 0;); |
1339 | 1339 | ||
@@ -1396,7 +1396,7 @@ static int ali_ircc_net_close(struct net_device *dev) | |||
1396 | 1396 | ||
1397 | IRDA_ASSERT(dev != NULL, return -1;); | 1397 | IRDA_ASSERT(dev != NULL, return -1;); |
1398 | 1398 | ||
1399 | self = (struct ali_ircc_cb *) dev->priv; | 1399 | self = netdev_priv(dev); |
1400 | IRDA_ASSERT(self != NULL, return 0;); | 1400 | IRDA_ASSERT(self != NULL, return 0;); |
1401 | 1401 | ||
1402 | /* Stop device */ | 1402 | /* Stop device */ |
@@ -1436,7 +1436,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1436 | 1436 | ||
1437 | IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ ); | 1437 | IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ ); |
1438 | 1438 | ||
1439 | self = (struct ali_ircc_cb *) dev->priv; | 1439 | self = netdev_priv(dev); |
1440 | iobase = self->io.fir_base; | 1440 | iobase = self->io.fir_base; |
1441 | 1441 | ||
1442 | netif_stop_queue(dev); | 1442 | netif_stop_queue(dev); |
@@ -1931,7 +1931,6 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) | |||
1931 | skb_reset_mac_header(skb); | 1931 | skb_reset_mac_header(skb); |
1932 | skb->protocol = htons(ETH_P_IRDA); | 1932 | skb->protocol = htons(ETH_P_IRDA); |
1933 | netif_rx(skb); | 1933 | netif_rx(skb); |
1934 | self->netdev->last_rx = jiffies; | ||
1935 | } | 1934 | } |
1936 | } | 1935 | } |
1937 | 1936 | ||
@@ -1960,7 +1959,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1960 | 1959 | ||
1961 | IRDA_ASSERT(dev != NULL, return 0;); | 1960 | IRDA_ASSERT(dev != NULL, return 0;); |
1962 | 1961 | ||
1963 | self = (struct ali_ircc_cb *) dev->priv; | 1962 | self = netdev_priv(dev); |
1964 | IRDA_ASSERT(self != NULL, return 0;); | 1963 | IRDA_ASSERT(self != NULL, return 0;); |
1965 | 1964 | ||
1966 | iobase = self->io.sir_base; | 1965 | iobase = self->io.sir_base; |
@@ -2028,7 +2027,7 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
2028 | 2027 | ||
2029 | IRDA_ASSERT(dev != NULL, return -1;); | 2028 | IRDA_ASSERT(dev != NULL, return -1;); |
2030 | 2029 | ||
2031 | self = dev->priv; | 2030 | self = netdev_priv(dev); |
2032 | 2031 | ||
2033 | IRDA_ASSERT(self != NULL, return -1;); | 2032 | IRDA_ASSERT(self != NULL, return -1;); |
2034 | 2033 | ||
@@ -2114,7 +2113,7 @@ static int ali_ircc_is_receiving(struct ali_ircc_cb *self) | |||
2114 | 2113 | ||
2115 | static struct net_device_stats *ali_ircc_net_get_stats(struct net_device *dev) | 2114 | static struct net_device_stats *ali_ircc_net_get_stats(struct net_device *dev) |
2116 | { | 2115 | { |
2117 | struct ali_ircc_cb *self = (struct ali_ircc_cb *) dev->priv; | 2116 | struct ali_ircc_cb *self = netdev_priv(dev); |
2118 | 2117 | ||
2119 | IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ ); | 2118 | IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ ); |
2120 | 2119 | ||