aboutsummaryrefslogtreecommitdiffstats
path: root/main/devicemaster-linux-vanilla/linux-4.19.patch
blob: 7a7b2545a0830963ee03c22063a9ba3bc86c40fb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
diff --git a/nslink.c b/nslink.c
index 7be65ff..5c7444f 100755
--- a/nslink.c
+++ b/nslink.c
@@ -4635,7 +4635,7 @@ static int tcp_txqueue_wait(tTcpTxQueueWait *in)
 #if LINUX_VERSION_CODE < VERSION_CODE(3,15,0)
 static void tcp_data_ready(struct sock *sk, int count)
 #else
-static void tcp_data_ready(struct sock *sk)
+void tcp_data_ready(struct sock *sk)
 #endif
 {
         struct si_state *si = (struct si_state *)(sk->sk_user_data);
@@ -5351,19 +5351,6 @@ static int nrp_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int nrp_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, nrp_proc_show, NULL);
-}
-
-static const struct file_operations nrp_proc_fops = {
-        .owner		= THIS_MODULE,
-        .open		= nrp_proc_open,
-        .read		= seq_read,
-        .llseek		= seq_lseek,
-        .release	= single_release,
-};
-
 static struct tty_operations nslink_ops = {
         .open = nrp_open,
         .close = nrp_close,
@@ -5384,7 +5371,7 @@ static struct tty_operations nslink_ops = {
         .wait_until_sent = nrp_wait_until_sent,
         .tiocmget = nrp_tiocmget,
         .tiocmset = nrp_tiocmset,
-        .proc_fops = &nrp_proc_fops,
+	.proc_show = &nrp_proc_show,
 };
 static const struct tty_port_operations nslink_port_ops = {
         .carrier_raised = nrp_port_carrier_raised,