This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / s390 / net / lcs.c

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index cac5795..cd58130 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -11,7 +11,7 @@
  *                       Frank Pavlic (pavlic@de.ibm.com) and
  *                       Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
- *    $Revision: 1.85 $         $Date: 2004/08/04 11:05:43 $
+ *    $Revision: 1.81 $         $Date: 2004/05/14 13:54:33 $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,6 @@
 #include <linux/inetdevice.h>
 #include <linux/in.h>
 #include <linux/igmp.h>
-#include <linux/delay.h>
 #include <net/arp.h>
 #include <net/ip.h>
 
@@ -59,7 +58,7 @@
 /**
  * initialization string for output
  */
-#define VERSION_LCS_C  "$Revision: 1.85 $"
+#define VERSION_LCS_C  "$Revision: 1.81 $"
 
 static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")";
 static char debug_buffer[255];
@@ -1047,8 +1046,8 @@ lcs_register_mc_addresses(void *data)
        }
        spin_unlock(&card->ipm_lock);
        read_unlock(&in4_dev->lock);
-       in_dev_put(in4_dev);
        lcs_fix_multicast_list(card);
+       in_dev_put(in4_dev);
        return 0;
 }
 /**
@@ -1421,7 +1420,7 @@ lcs_resetcard(struct lcs_card *card)
                                   card->dev->name);
                        return 0;
                }
-               msleep(3000);
+               schedule_timeout(3 * HZ);
        }
        PRINT_ERR("Error in Reseting LCS card!\n");
        return -EIO;