diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2003-05-25 23:35:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-25 23:35:45 -0700 |
| commit | ac8d3d2f491202ade529190c3441baefe7328081 (patch) | |
| tree | 8060133e055ca9a4c3b549db38bae171b3fad9c9 | |
| parent | ea7629c9f4b62b9d4fc92b3842c1d8d603b52387 (diff) | |
[PATCH] s390: network device drivers.
s390 network device driver fixes:
- Make use of SET_MODULE_OWNER.
- Fix ctc interrupt handler.
| -rw-r--r-- | drivers/s390/net/ctcmain.c | 10 | ||||
| -rw-r--r-- | drivers/s390/net/ctctty.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/lcs.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/netiucv.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index 1262a21f4398..c97a2c4a2c5e 100644 --- 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 $ * */ @@ -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 ba75c7c935c6..6993de816be9 100644 --- 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 59799d2e7933..43fc1556a33d 100644 --- 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 70239773ec7c..952213a5eeee 100644 --- 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; } |