1 files changed, 24 insertions, 28 deletions

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 2a6c7a60756f..e6e2ce3e7bcf 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -64,7 +64,7 @@ static struct x25_asy *x25_asy_alloc(void)
                 if (dev == NULL)
                         break;
 
-                sl = dev->priv;
+                sl = netdev_priv(dev);
                 /* Not in use ? */
                 if (!test_and_set_bit(SLF_INUSE, &sl->flags))
                         return sl;
@@ -86,7 +86,7 @@ static struct x25_asy *x25_asy_alloc(void)
                         return NULL;
 
                 /* Initialize channel control data */
-                sl = dev->priv;
+                sl = netdev_priv(dev);
                 dev->base_addr    = i;
 
                 /* register device so that it can be ifconfig'ed       */
@@ -120,7 +120,7 @@ static void x25_asy_free(struct x25_asy *sl)
 
 static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         unsigned char *xbuff, *rbuff;
         int len = 2 * newmtu;
 
@@ -211,7 +211,6 @@ static void x25_asy_bump(struct x25_asy *sl)
                 printk(KERN_DEBUG "x25_asy: data received err - %d\n", err);
         } else {
                 netif_rx(skb);
-                sl->dev->last_rx = jiffies;
                 sl->stats.rx_packets++;
         }
 }
@@ -243,7 +242,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
          * if we did not request it before write operation.
          *       14 Oct 1994  Dmitry Gorodchanin.
          */
-        sl->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
+        set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
         actual = sl->tty->ops->write(sl->tty, sl->xbuff, count);
         sl->xleft = count - actual;
         sl->xhead = sl->xbuff + actual;
@@ -258,7 +257,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
 static void x25_asy_write_wakeup(struct tty_struct *tty)
 {
         int actual;
-        struct x25_asy *sl = (struct x25_asy *) tty->disc_data;
+        struct x25_asy *sl = tty->disc_data;
 
         /* First make sure we're connected. */
         if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev))
@@ -268,7 +267,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty)
                 /* Now serial buffer is almost free & we can start
                  * transmission of another packet */
                 sl->stats.tx_packets++;
-                tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
                 x25_asy_unlock(sl);
                 return;
         }
@@ -280,7 +279,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty)
 
 static void x25_asy_timeout(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
 
         spin_lock(&sl->lock);
         if (netif_queue_stopped(dev)) {
@@ -291,7 +290,7 @@ static void x25_asy_timeout(struct net_device *dev)
                        (tty_chars_in_buffer(sl->tty) || sl->xleft) ?
                        "bad line quality" : "driver error");
                 sl->xleft = 0;
-                sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
                 x25_asy_unlock(sl);
         }
         spin_unlock(&sl->lock);
@@ -301,7 +300,7 @@ static void x25_asy_timeout(struct net_device *dev)
 
 static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         int err;
 
         if (!netif_running(sl->dev)) {
@@ -361,7 +360,6 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)
 {
-        skb->dev->last_rx = jiffies;
         return netif_rx(skb);
 }
 
@@ -373,7 +371,7 @@ static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)
 
 static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
 
         spin_lock(&sl->lock);
         if (netif_queue_stopped(sl->dev) || sl->tty == NULL) {
@@ -398,7 +396,7 @@ static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
 
 static void x25_asy_connected(struct net_device *dev, int reason)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         struct sk_buff *skb;
         unsigned char *ptr;
 
@@ -413,12 +411,11 @@ static void x25_asy_connected(struct net_device *dev, int reason)
 
         skb->protocol = x25_type_trans(skb, sl->dev);
         netif_rx(skb);
-        sl->dev->last_rx = jiffies;
 }
 
 static void x25_asy_disconnected(struct net_device *dev, int reason)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         struct sk_buff *skb;
         unsigned char *ptr;
 
@@ -433,7 +430,6 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
 
         skb->protocol = x25_type_trans(skb, sl->dev);
         netif_rx(skb);
-        sl->dev->last_rx = jiffies;
 }
 
 static struct lapb_register_struct x25_asy_callbacks = {
@@ -450,7 +446,7 @@ static struct lapb_register_struct x25_asy_callbacks = {
 /* Open the low-level part of the X.25 channel. Easy! */
 static int x25_asy_open(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         unsigned long len;
         int err;
 
@@ -499,12 +495,12 @@ norbuff:
 /* Close the low-level part of the X.25 channel. Easy! */
 static int x25_asy_close(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         int err;
 
         spin_lock(&sl->lock);
         if (sl->tty)
-                sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
 
         netif_stop_queue(dev);
         sl->rcount = 0;
@@ -527,7 +523,7 @@ static int x25_asy_close(struct net_device *dev)
 static void x25_asy_receive_buf(struct tty_struct *tty,
                                 const unsigned char *cp, char *fp, int count)
 {
-        struct x25_asy *sl = (struct x25_asy *) tty->disc_data;
+        struct x25_asy *sl = tty->disc_data;
 
         if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev))
                 return;
@@ -555,7 +551,7 @@ static void x25_asy_receive_buf(struct tty_struct *tty,
 
 static int x25_asy_open_tty(struct tty_struct *tty)
 {
-        struct x25_asy *sl = (struct x25_asy *) tty->disc_data;
+        struct x25_asy *sl = tty->disc_data;
         int err;
 
         if (tty->ops->write == NULL)
@@ -596,7 +592,7 @@ static int x25_asy_open_tty(struct tty_struct *tty)
  */
 static void x25_asy_close_tty(struct tty_struct *tty)
 {
-        struct x25_asy *sl = (struct x25_asy *) tty->disc_data;
+        struct x25_asy *sl = tty->disc_data;
 
         /* First make sure we're connected. */
         if (!sl || sl->magic != X25_ASY_MAGIC)
@@ -615,7 +611,7 @@ static void x25_asy_close_tty(struct tty_struct *tty)
 
 static struct net_device_stats *x25_asy_get_stats(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         return &sl->stats;
 }
 
@@ -624,7 +620,7 @@ static struct net_device_stats *x25_asy_get_stats(struct net_device *dev)
   *                     STANDARD X.25 ENCAPSULATION                      *
   ************************************************************************/
 
-int x25_asy_esc(unsigned char *s, unsigned char *d, int len)
+static int x25_asy_esc(unsigned char *s, unsigned char *d, int len)
 {
         unsigned char *ptr = d;
         unsigned char c;
@@ -696,7 +692,7 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
 static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
                          unsigned int cmd,  unsigned long arg)
 {
-        struct x25_asy *sl = (struct x25_asy *) tty->disc_data;
+        struct x25_asy *sl = tty->disc_data;
 
         /* First make sure we're connected. */
         if (!sl || sl->magic != X25_ASY_MAGIC)
@@ -717,7 +713,7 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
 
 static int x25_asy_open_dev(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         if (sl->tty == NULL)
                 return -ENODEV;
         return 0;
@@ -726,7 +722,7 @@ static int x25_asy_open_dev(struct net_device *dev)
 /* Initialise the X.25 driver.  Called by the device init code */
 static void x25_asy_setup(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
 
         sl->magic  = X25_ASY_MAGIC;
         sl->dev    = dev;
@@ -793,7 +789,7 @@ static void __exit exit_x25_asy(void)
         for (i = 0; i < x25_asy_maxdev; i++) {
                 dev = x25_asy_devs[i];
                 if (dev) {
-                        struct x25_asy *sl = dev->priv;
+                        struct x25_asy *sl = netdev_priv(dev);
 
                         spin_lock_bh(&sl->lock);
                         if (sl->tty)