1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 417e9e675fac..dd0de3a9ed4e 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1234,7 +1234,7 @@ static void ResetRadio(struct strip *strip_info)
 
 static void strip_write_some_more(struct tty_struct *tty)
 {
-        struct strip *strip_info = (struct strip *) tty->disc_data;
+        struct strip *strip_info = tty->disc_data;
 
         /* First make sure we're connected. */
         if (!strip_info || strip_info->magic != STRIP_MAGIC ||
@@ -1252,7 +1252,7 @@ static void strip_write_some_more(struct tty_struct *tty)
 #endif
         } else {                /* Else start transmission of another packet */
 
-                tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
                 strip_unlock(strip_info);
         }
 }
@@ -1455,8 +1455,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb)
          */
         strip_info->tx_head = strip_info->tx_buff;
         strip_info->tx_left = ptr - strip_info->tx_buff;
-        strip_info->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
-
+        set_bit(TTY_DO_WRITE_WAKEUP, &strip_info->tty->flags);
         /*
          * 4. Debugging check to make sure we're not overflowing the buffer.
          */
@@ -1997,7 +1996,6 @@ static void deliver_packet(struct strip *strip_info, STRIP_Header * header,
 #ifdef EXT_COUNTERS
                 strip_info->rx_bytes += packetlen;
 #endif
-                skb->dev->last_rx = jiffies;
                 netif_rx(skb);
         }
 }
@@ -2261,7 +2259,7 @@ static void process_message(struct strip *strip_info)
 static void strip_receive_buf(struct tty_struct *tty, const unsigned char *cp,
                   char *fp, int count)
 {
-        struct strip *strip_info = (struct strip *) tty->disc_data;
+        struct strip *strip_info = tty->disc_data;
         const unsigned char *end = cp + count;
 
         if (!strip_info || strip_info->magic != STRIP_MAGIC
@@ -2455,8 +2453,7 @@ static int strip_close_low(struct net_device *dev)
 
         if (strip_info->tty == NULL)
                 return -EBUSY;
-        strip_info->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
-
+        clear_bit(TTY_DO_WRITE_WAKEUP, &strip_info->tty->flags);
         netif_stop_queue(dev);
 
         /*
@@ -2490,7 +2487,6 @@ static void strip_dev_setup(struct net_device *dev)
          */
 
         dev->trans_start = 0;
-        dev->last_rx = 0;
         dev->tx_queue_len = 30; /* Drop after 30 frames queued */
 
         dev->flags = 0;
@@ -2498,7 +2494,7 @@ static void strip_dev_setup(struct net_device *dev)
         dev->type = ARPHRD_METRICOM;    /* dtang */
         dev->hard_header_len = sizeof(STRIP_Header);
         /*
-         *  dev->priv             Already holds a pointer to our struct strip
+         *  netdev_priv(dev) Already holds a pointer to our struct strip
          */
 
         *(MetricomAddress *) & dev->broadcast = broadcast_address;
@@ -2598,7 +2594,7 @@ static struct strip *strip_alloc(void)
 
 static int strip_open(struct tty_struct *tty)
 {
-        struct strip *strip_info = (struct strip *) tty->disc_data;
+        struct strip *strip_info = tty->disc_data;
 
         /*
          * First make sure we're not already connected.
@@ -2669,7 +2665,7 @@ static int strip_open(struct tty_struct *tty)
 
 static void strip_close(struct tty_struct *tty)
 {
-        struct strip *strip_info = (struct strip *) tty->disc_data;
+        struct strip *strip_info = tty->disc_data;
 
         /*
          * First make sure we're connected.
@@ -2695,7 +2691,7 @@ static void strip_close(struct tty_struct *tty)
 static int strip_ioctl(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
-        struct strip *strip_info = (struct strip *) tty->disc_data;
+        struct strip *strip_info = tty->disc_data;
 
         /*
          * First make sure we're connected.