diff options
Diffstat (limited to 'drivers/s390/net/ctcmain.h')
| -rw-r--r-- | drivers/s390/net/ctcmain.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/s390/net/ctcmain.h b/drivers/s390/net/ctcmain.h index d2e835c0c134..7f305d119f3d 100644 --- a/drivers/s390/net/ctcmain.h +++ b/drivers/s390/net/ctcmain.h | |||
| @@ -35,7 +35,9 @@ | |||
| 35 | #include <asm/ccwdev.h> | 35 | #include <asm/ccwdev.h> |
| 36 | #include <asm/ccwgroup.h> | 36 | #include <asm/ccwgroup.h> |
| 37 | 37 | ||
| 38 | #include "ctctty.h" | 38 | #include <linux/skbuff.h> |
| 39 | #include <linux/netdevice.h> | ||
| 40 | |||
| 39 | #include "fsm.h" | 41 | #include "fsm.h" |
| 40 | #include "cu3088.h" | 42 | #include "cu3088.h" |
| 41 | 43 | ||
| @@ -50,9 +52,7 @@ | |||
| 50 | 52 | ||
| 51 | #define CTC_PROTO_S390 0 | 53 | #define CTC_PROTO_S390 0 |
| 52 | #define CTC_PROTO_LINUX 1 | 54 | #define CTC_PROTO_LINUX 1 |
| 53 | #define CTC_PROTO_LINUX_TTY 2 | ||
| 54 | #define CTC_PROTO_OS390 3 | 55 | #define CTC_PROTO_OS390 3 |
| 55 | #define CTC_PROTO_MAX 3 | ||
| 56 | 56 | ||
| 57 | #define CTC_BUFSIZE_LIMIT 65535 | 57 | #define CTC_BUFSIZE_LIMIT 65535 |
| 58 | #define CTC_BUFSIZE_DEFAULT 32768 | 58 | #define CTC_BUFSIZE_DEFAULT 32768 |
| @@ -257,15 +257,13 @@ static __inline__ void | |||
| 257 | ctc_clear_busy(struct net_device * dev) | 257 | ctc_clear_busy(struct net_device * dev) |
| 258 | { | 258 | { |
| 259 | clear_bit(0, &(((struct ctc_priv *) dev->priv)->tbusy)); | 259 | clear_bit(0, &(((struct ctc_priv *) dev->priv)->tbusy)); |
| 260 | if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY) | 260 | netif_wake_queue(dev); |
| 261 | netif_wake_queue(dev); | ||
| 262 | } | 261 | } |
| 263 | 262 | ||
| 264 | static __inline__ int | 263 | static __inline__ int |
| 265 | ctc_test_and_set_busy(struct net_device * dev) | 264 | ctc_test_and_set_busy(struct net_device * dev) |
| 266 | { | 265 | { |
| 267 | if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY) | 266 | netif_stop_queue(dev); |
| 268 | netif_stop_queue(dev); | ||
| 269 | return test_and_set_bit(0, &((struct ctc_priv *) dev->priv)->tbusy); | 267 | return test_and_set_bit(0, &((struct ctc_priv *) dev->priv)->tbusy); |
| 270 | } | 268 | } |
| 271 | 269 | ||
