s390: network driver.
Subsystems (4)
PATCH 6/6 s390: network driver.
[patch 6/6] s390: network driver.
From: Frank Pavlic <[email protected]>
From: Thomas Spatzier <[email protected]>
s390 network driver changes:
- ctc/iucv: Use DECLARE_PER_CPU instead of extern DEFINE_PER_CPU.
- lcs: Always set channel state to CH_STATE_INIT when stopping channels.
- qeth: vlan fixes.
Signed-off-by Martin Schwidefsky <[email protected]>
diffstat:
drivers/s390/net/ctcdbug.h | 6 - drivers/s390/net/iucv.h | 2 drivers/s390/net/lcs.c | 8 - drivers/s390/net/qeth.h | 4 drivers/s390/net/qeth_main.c | 241 ++++++++++++++++++++----------------------- 5 files changed, 126 insertions(+), 135 deletions(-)
drivers/s390/net/ctcdbug.h +3 -3
@@ -1,6 +1,6 @@/* * -* linux/drivers/s390/net/ctcdbug.h ($Revision: 1.3 $) +* linux/drivers/s390/net/ctcdbug.h ($Revision: 1.4 $) * * CTC / ESCON network driver - s390 dbf exploit. *
@@ -9,7 +9,7 @@* Author(s): Original Code written by * Peter Tiedemann ([email protected]) * -* $Revision: 1.3 $ $Date: 2004/07/28 12:27:54 $ +* $Revision: 1.4 $ $Date: 2004/10/15 09:26:58 $ * * 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
@@ -59,7 +59,7 @@ debug_event(ctc_dbf_##name,level,(void*)(addr),len); \ } while (0) -extern DEFINE_PER_CPU(char[256], ctc_dbf_txt_buf); +DECLARE_PER_CPU (char[256 ], ctc_dbf_txt_buf);extern debug_info_t *ctc_dbf_setup;extern debug_info_t *ctc_dbf_data;extern debug_info_t *ctc_dbf_trace;
drivers/s390/net/iucv.h +1 -1
@@ -63,7 +63,7 @@ debug_event(iucv_dbf_##name,level,(void*)(addr),len); \ } while (0) -extern DEFINE_PER_CPU(char[256], iucv_dbf_txt_buf); +DECLARE_PER_CPU (char[256 ], iucv_dbf_txt_buf); #define IUCV_DBF_TEXT_(name,level,text...) \ do { \
drivers/s390/net/lcs.c +4 -4
@@ -11,7 +11,7 @@* Frank Pavlic ([email protected]) and * Martin Schwidefsky <[email protected]> * -* $Revision: 1.92 $ $Date: 2004/09/03 08:06:11 $ +* $Revision: 1.94 $ $Date: 2004/10/19 09:30:54 $ * * 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
@@ -59,7 +59,7 @@/** * initialization string for output */ -#define VERSION_LCS_C "$Revision: 1.92 $" +#define VERSION_LCS_C "$Revision: 1.94 $"static char version[]__initdata ="LCS driver (" VERSION_LCS_C "/" VERSION_LCS_H ")" ;static char debug_buffer[255 ];
@@ -549,6 +549,7 @@return 0 ;LCS_DBF_TEXT (4 ,trace,"haltsch" );LCS_DBF_TEXT_ (4 ,trace,"%s" , channel->ccwdev->dev.bus_id); + channel->state =CH_STATE_INIT ;spin_lock_irqsave (get_ccwdev_lock (channel->ccwdev), flags); rc =ccw_device_halt (channel->ccwdev, (addr_t ) channel);spin_unlock_irqrestore (get_ccwdev_lock (channel->ccwdev), flags);
@@ -1357,6 +1358,7 @@LCS_DBF_TEXT_ (5 , trace,"Rint%s" ,cdev->dev.bus_id);LCS_DBF_TEXT_ (5 , trace,"%4x%4x" ,irb->scsw.cstat, irb->scsw.dstat); +LCS_DBF_TEXT_ (5 , trace,"%4x%4x" ,irb->scsw.fctl, irb->scsw.actl);/* How far in the ccw chain have we processed? */ if ((channel->state != CH_STATE_INIT) &&
@@ -1624,8 +1626,6 @@/* start/reset card */ if (card->dev)netif_stop_queue (card->dev); - card->write.state =CH_STATE_INIT ; - card->read.state =CH_STATE_INIT ; rc =lcs_stop_channels (card);if (rc ==0 ) { rc =lcs_start_channels (card);
drivers/s390/net/qeth.h +1 -3
@@ -92,7 +92,7 @@ debug_event(qeth_dbf_##name,level,(void*)(addr),len); \ } while (0) -extern DEFINE_PER_CPU(char[256], qeth_dbf_txt_buf); +DECLARE_PER_CPU (char[256 ], qeth_dbf_txt_buf); #define QETH_DBF_TEXT_(name,level,text...) \ do { \
@@ -740,8 +740,6 @@#ifdef CONFIG_QETH_VLAN spinlock_t vlanlock;struct vlan_group *vlangrp; -__u8 vlans_current[VLAN_GROUP_ARRAY_LEN /(8 *sizeof (__u8))]; -__u8 vlans_new[VLAN_GROUP_ARRAY_LEN /(8 *sizeof (__u8))];#endif struct work_struct kernel_thread_starter;spinlock_t thread_mask_lock;
drivers/s390/net/qeth_main.c +117 -124
407 lines not on this page · raw message