Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
linux
Commits
f4a818e0
Commit
f4a818e0
authored
17 years ago
by
Linus Torvalds
Browse files
Options
Download
Email Patches
Plain Diff
Import 1.1.55
parent
057f54fb
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
include/linux/tty.h
include/linux/tty.h
+1
-0
kernel/ksyms.c
kernel/ksyms.c
+4
-0
net/inet/tcp.c
net/inet/tcp.c
+10
-7
No files found.
include/linux/tty.h
View file @
f4a818e0
...
...
@@ -289,6 +289,7 @@ extern void stop_tty(struct tty_struct * tty);
extern
void
start_tty
(
struct
tty_struct
*
tty
);
extern
int
tty_register_ldisc
(
int
disc
,
struct
tty_ldisc
*
new_ldisc
);
extern
int
tty_register_driver
(
struct
tty_driver
*
driver
);
extern
int
tty_unregister_driver
(
struct
tty_driver
*
driver
);
extern
int
tty_read_raw_data
(
struct
tty_struct
*
tty
,
unsigned
char
*
bufp
,
int
buflen
);
...
...
This diff is collapsed.
Click to expand it.
kernel/ksyms.c
View file @
f4a818e0
...
...
@@ -25,6 +25,7 @@
#include <linux/module.h>
#include <linux/termios.h>
#include <linux/tqueue.h>
#include <linux/tty.h>
#include <linux/serial.h>
#ifdef CONFIG_INET
#include <linux/netdevice.h>
...
...
@@ -91,6 +92,9 @@ struct symbol_table symbol_table = { 0, 0, 0, /* for stacked module support */
X
(
unregister_chrdev
),
X
(
register_blkdev
),
X
(
unregister_blkdev
),
X
(
tty_register_driver
),
X
(
tty_unregister_driver
),
X
(
tty_std_termios
),
/* block device driver support */
X
(
block_read
),
...
...
This diff is collapsed.
Click to expand it.
net/inet/tcp.c
View file @
f4a818e0
...
...
@@ -83,6 +83,7 @@
* Matt Dillon : Yet more small nasties remove from the TCP code
* (Be very nice to this man if tcp finally works 100%) 8)
* Alan Cox : BSD accept semantics.
* Peter De Schrijver : ENOTCONN check missing in tcp_sendto().
*
*
* To Fix:
...
...
@@ -1221,15 +1222,17 @@ static int tcp_sendto(struct sock *sk, unsigned char *from,
{
if
(
flags
&
~
(
MSG_OOB
|
MSG_DONTROUTE
))
return
-
EINVAL
;
if
(
addr_len
<
sizeof
(
*
addr
))
return
(
-
EINVAL
);
if
(
!
tcp_connected
(
sk
->
state
))
return
-
ENOTCONN
;
if
(
addr_len
<
sizeof
(
*
addr
))
return
-
EINVAL
;
if
(
addr
->
sin_family
&&
addr
->
sin_family
!=
AF_INET
)
return
(
-
EINVAL
)
;
return
-
EINVAL
;
if
(
addr
->
sin_port
!=
sk
->
dummy_th
.
dest
)
return
(
-
EISCONN
)
;
return
-
EISCONN
;
if
(
addr
->
sin_addr
.
s_addr
!=
sk
->
daddr
)
return
(
-
EISCONN
)
;
return
(
tcp_write
(
sk
,
from
,
len
,
nonblock
,
flags
)
)
;
return
-
EISCONN
;
return
tcp_write
(
sk
,
from
,
len
,
nonblock
,
flags
);
}
...
...
@@ -2238,7 +2241,7 @@ static void tcp_close(struct sock *sk, int timeout)
/* The +1 is not needed because the FIN takes up seq
is not read!!! */
if
(
skb
->
len
>
0
&&
after
(
skb
->
h
.
th
->
seq
+
skb
->
len
,
sk
->
copied_seq
))
need_reset
=
1
;
need_reset
=
0
;
kfree_skb
(
skb
,
FREE_READ
);
}
if
(
sk
->
debug
)
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment