s390: remove tty support from ctc network device driver [1/2]
Subsystems (4)
PATCH RESEND 1/2 s390: remove tty support from ctc network device driver [1/2]
Hi jeff,
after the first shot I sent to you did not apply I
resend two new patches I've made today to remove tty from ctc network driver. Please apply ....
Thank you ...
Frank
From: Peter Tiedemann <[email protected]>
[1/2]:
tty support code will be removed from the ctc network device driver. Today we have a couple of alternatives which are performing much better. The second thing is that ctc should be a network device driver only.
We should not mix tty and networking here.
This first patch will remove the tty code from ctcmain.c . It also removes the build entry from the Makefile as well as TTY definitions from ctcmain.h.
The second patch will remove two files, ctctty.c and ctctty.h.
---
drivers/s390/net/Makefile | 3 ++- drivers/s390/net/ctcmain.c | 45 +++++++++----------------------------------- drivers/s390/net/ctcmain.h | 12 +++++------- 3 files changed, 16 insertions(+), 44 deletions(-)
fd1e8730b620e901a223034aaa6d97dde7a63b56
drivers/s390/net/Makefile +2 -1
@@ -2,7 +2,7 @@ # S/390 network devices # -ctc-objs := ctcmain.o ctctty.o ctcdbug.o +ctc-objs := ctcmain.o ctcdbug.o obj-$(CONFIG_IUCV) += iucv.o obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o
@@ -10,6 +10,7 @@ obj-$(CONFIG_SMSGIUCV) += smsgiucv.o obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o obj-$(CONFIG_LCS) += lcs.o cu3088.o obj-$(CONFIG_CLAW) += claw.o cu3088.o +obj-$(CONFIG_MPC) += ctcmpc.o fsm.o cu3088.o qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth-$(CONFIG_PROC_FS) += qeth_proc.o obj-$(CONFIG_QETH) += qeth.o
drivers/s390/net/ctcmain.c +9 -36
140 lines not on this page · raw message
drivers/s390/net/ctcmain.h +5 -7
@@ -35,7 +35,9 @@#include <asm/ccwdev.h> #include <asm/ccwgroup.h> -#include "ctctty.h" +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include "fsm.h" #include "cu3088.h"
@@ -50,9 +52,7 @@#define CTC_PROTO_S390 0#define CTC_PROTO_LINUX 1 -#define CTC_PROTO_LINUX_TTY 2#define CTC_PROTO_OS390 3 -#define CTC_PROTO_MAX 3#define CTC_BUFSIZE_LIMIT 65535#define CTC_BUFSIZE_DEFAULT 32768
@@ -257,15 +257,13 @@ static __inline__ void ctc_clear_busy(struct net_device * dev) {clear_bit (0 , &(((struct ctc_priv *) dev->priv)->tbusy)); -if (((struct ctc_priv *)dev->priv)->protocol !=CTC_PROTO_LINUX_TTY ) -netif_wake_queue (dev); +netif_wake_queue (dev); }static __inline__int ctc_test_and_set_busy (struct net_device * dev) { -if (((struct ctc_priv *)dev->priv)->protocol !=CTC_PROTO_LINUX_TTY ) -netif_stop_queue (dev); +netif_stop_queue (dev);return test_and_set_bit (0 , &((struct ctc_priv *) dev->priv)->tbusy); }
Signature · 1 line
1.2.4
Quoted 5 lines · Frank Pavlic
Hi jeff, after the first shot I sent to you did not apply I resend two new patches I've made today to remove tty from ctc network driver. Please apply ....
Thank you ...
applied 1-2 to #upstream (queued for 2.6.18, since 2.6.17 is in -rc)