git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
s390
/
net
/
ctcmain.h
diff --git
a/drivers/s390/net/ctcmain.h
b/drivers/s390/net/ctcmain.h
index
7f305d1
..
d2e835c
100644
(file)
--- a/
drivers/s390/net/ctcmain.h
+++ b/
drivers/s390/net/ctcmain.h
@@
-35,9
+35,7
@@
#include <asm/ccwdev.h>
#include <asm/ccwgroup.h>
#include <asm/ccwdev.h>
#include <asm/ccwgroup.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-
+#include "ctctty.h"
#include "fsm.h"
#include "cu3088.h"
#include "fsm.h"
#include "cu3088.h"
@@
-52,7
+50,9
@@
#define CTC_PROTO_S390 0
#define CTC_PROTO_LINUX 1
#define CTC_PROTO_S390 0
#define CTC_PROTO_LINUX 1
+#define CTC_PROTO_LINUX_TTY 2
#define CTC_PROTO_OS390 3
#define CTC_PROTO_OS390 3
+#define CTC_PROTO_MAX 3
#define CTC_BUFSIZE_LIMIT 65535
#define CTC_BUFSIZE_DEFAULT 32768
#define CTC_BUFSIZE_LIMIT 65535
#define CTC_BUFSIZE_DEFAULT 32768
@@
-257,13
+257,15
@@
static __inline__ void
ctc_clear_busy(struct net_device * dev)
{
clear_bit(0, &(((struct ctc_priv *) dev->priv)->tbusy));
ctc_clear_busy(struct net_device * dev)
{
clear_bit(0, &(((struct ctc_priv *) dev->priv)->tbusy));
- netif_wake_queue(dev);
+ if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY)
+ netif_wake_queue(dev);
}
static __inline__ int
ctc_test_and_set_busy(struct net_device * dev)
{
}
static __inline__ int
ctc_test_and_set_busy(struct net_device * dev)
{
- netif_stop_queue(dev);
+ if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY)
+ netif_stop_queue(dev);
return test_and_set_bit(0, &((struct ctc_priv *) dev->priv)->tbusy);
}
return test_and_set_bit(0, &((struct ctc_priv *) dev->priv)->tbusy);
}