[PATCH] s390: network device drivers.

s390 network device driver fixes:
 - Make use of SET_MODULE_OWNER.
 - Fix ctc interrupt handler.

diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 1262a21f4398d2e8ae5615ffc5bb03287d12bc95..c97a2c4a2c5e4c322fe9e1f27065ebc3d17a7d52 100644 (file)
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ctcmain.c,v 1.41 2003/04/15 16:45:37 aberg Exp $
+ * $Id: ctcmain.c,v 1.42 2003/05/23 17:45:57 felfert Exp $
  *
  * CTC / ESCON network driver
  *
@@ -36,7 +36,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.41 $
+ * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.42 $
  *
  */
 \f
@@ -272,7 +272,7 @@ static void
 print_banner(void)
 {
        static int printed = 0;
-       char vbuf[] = "$Revision: 1.41 $";
+       char vbuf[] = "$Revision: 1.42 $";
        char *version = vbuf;
 
        if (printed)
@@ -1966,7 +1966,7 @@ ctc_irq_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
        if (priv->channel[READ]->cdev == cdev)
                ch = priv->channel[READ];
        else if (priv->channel[WRITE]->cdev == cdev)
-               ch = priv->channel[READ];
+               ch = priv->channel[WRITE];
        else {
                printk(KERN_ERR
                       "ctc: Can't determine channel for interrupt, "
@@ -2751,8 +2751,8 @@ ctc_init_netdevice(struct net_device * dev, int alloc_device,
        dev->addr_len = 0;
        dev->type = ARPHRD_SLIP;
        dev->tx_queue_len = 100;
-       dev->owner = THIS_MODULE;
        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
+       SET_MODULE_OWNER(&tun->dev);
        return dev;
 }
 

diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c
index ba75c7c935c6383a7d859643b29dbd5371c06ccb..6993de816be9ac926914f4b15d98c4a8e8721ea4 100644 (file)
--- a/drivers/s390/net/ctctty.c
+++ b/drivers/s390/net/ctctty.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ctctty.c,v 1.10 2003/03/21 18:47:31 aberg Exp $
+ * $Id: ctctty.c,v 1.11 2003/05/06 09:40:55 mschwide Exp $
  *
  * CTC / ESCON network driver, tty interface.
  *

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 59799d2e7933f8edddb8936f9730f5506d491594..43fc1556a33d1282e2ace506539fc5ecd23ce624 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1786,7 +1786,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
                dev->set_multicast_list = lcs_set_multicast_list;
 #endif
        dev->get_stats = lcs_getstats;
-       dev->owner = THIS_MODULE;
+       SET_MODULE_OWNER(&tun->dev);
        netif_stop_queue(dev);
        lcs_stopcard(card);
        return 0;

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 70239773ec7c2f1c4a38e5a821cc78d640bfbb90..952213a5eeee218bdb54043dcf2bb635a038a28d 100644 (file)
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1630,8 +1630,8 @@ netiucv_init_netdevice(int ifno, char *username)
        dev->addr_len            = 0;
        dev->type                = ARPHRD_SLIP;
        dev->tx_queue_len        = NETIUCV_QUEUELEN_DEFAULT;
-       dev->owner               = THIS_MODULE;
        dev->flags               = IFF_POINTOPOINT | IFF_NOARP;
+       SET_MODULE_OWNER(&tun->dev);
        return dev;
 }