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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
s390
/
net
/
ctctty.c
diff --git
a/drivers/s390/net/ctctty.c
b/drivers/s390/net/ctctty.c
index
2806b2d
..
a4fda34
100644
(file)
--- a/
drivers/s390/net/ctctty.c
+++ b/
drivers/s390/net/ctctty.c
@@
-489,7
+489,7
@@
ctc_tty_shutdown(ctc_tty_info * info)
* - If dialing, abort dial.
*/
static int
* - If dialing, abort dial.
*/
static int
-ctc_tty_write(struct tty_struct *tty,
int from_user,
const u_char * buf, int count)
+ctc_tty_write(struct tty_struct *tty, const u_char * buf, int count)
{
int c;
int total = 0;
{
int c;
int total = 0;
@@
-506,8
+506,6
@@
ctc_tty_write(struct tty_struct *tty, int from_user, const u_char * buf, int cou
total = -ENODEV;
goto ex;
}
total = -ENODEV;
goto ex;
}
- if (from_user)
- down(&info->write_sem);
while (1) {
struct sk_buff *skb;
int skb_res;
while (1) {
struct sk_buff *skb;
int skb_res;
@@
-526,11
+524,7
@@
ctc_tty_write(struct tty_struct *tty, int from_user, const u_char * buf, int cou
break;
}
skb_reserve(skb, skb_res);
break;
}
skb_reserve(skb, skb_res);
- if (from_user)
- copy_from_user(skb_put(skb, c),
- (const u_char __user *)buf, c);
- else
- memcpy(skb_put(skb, c), buf, c);
+ memcpy(skb_put(skb, c), buf, c);
skb_queue_tail(&info->tx_queue, skb);
buf += c;
total += c;
skb_queue_tail(&info->tx_queue, skb);
buf += c;
total += c;
@@
-540,8
+534,6
@@
ctc_tty_write(struct tty_struct *tty, int from_user, const u_char * buf, int cou
info->lsr &= ~UART_LSR_TEMT;
tasklet_schedule(&info->tasklet);
}
info->lsr &= ~UART_LSR_TEMT;
tasklet_schedule(&info->tasklet);
}
- if (from_user)
- up(&info->write_sem);
ex:
DBF_TEXT(trace, 6, __FUNCTION__);
return total;
ex:
DBF_TEXT(trace, 6, __FUNCTION__);
return total;