diff options
Diffstat (limited to 'main/devicemaster-linux-grsec/nslink.patch')
| -rw-r--r-- | main/devicemaster-linux-grsec/nslink.patch | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/main/devicemaster-linux-grsec/nslink.patch b/main/devicemaster-linux-grsec/nslink.patch index 79d7fc444f..98703430f8 100644 --- a/main/devicemaster-linux-grsec/nslink.patch +++ b/main/devicemaster-linux-grsec/nslink.patch @@ -1,8 +1,8 @@ diff --git a/nslink.c b/nslink.c -index 6de4618..d67d8b0 100755 +index bf4a922..1672325 100755 --- a/nslink.c +++ b/nslink.c -@@ -113,6 +113,7 @@ +@@ -117,6 +117,7 @@ #include <linux/slab.h> #include <linux/time.h> #include <linux/delay.h> @@ -10,7 +10,7 @@ index 6de4618..d67d8b0 100755 #if LINUX_VERSION_CODE >= VERSION_CODE(2,6,36) && LINUX_VERSION_CODE < VERSION_CODE(2,6,39) #include <linux/smp_lock.h> #endif -@@ -2864,7 +2865,7 @@ static int nrp_open(struct tty_struct *tty, struct file *filp) +@@ -2874,7 +2875,7 @@ static int nrp_open(struct tty_struct *tty, struct file *filp) info = nrp_table[line]; @@ -19,7 +19,7 @@ index 6de4618..d67d8b0 100755 if (!info->si) { DebugOpenErr("ttySI%d info->si==NULL: return -ENODEV\n", line); -@@ -2880,9 +2881,9 @@ static int nrp_open(struct tty_struct *tty, struct file *filp) +@@ -2890,9 +2891,9 @@ static int nrp_open(struct tty_struct *tty, struct file *filp) ret = tty_port_open(&info->port, tty, filp); if (ret && ret != -ERESTARTSYS) @@ -31,7 +31,7 @@ index 6de4618..d67d8b0 100755 return ret; } -@@ -2925,9 +2926,9 @@ static void nrp_port_shutdown(struct tty_port *port) +@@ -2935,9 +2936,9 @@ static void nrp_port_shutdown(struct tty_port *port) static void nrp_close(struct tty_struct *tty, struct file *filp) { struct nr_port *info = (struct nr_port *) tty->driver_data; @@ -43,25 +43,7 @@ index 6de4618..d67d8b0 100755 } static void nrp_set_termios(struct tty_struct *tty, struct ktermios *old_termios) -@@ -4094,7 +4095,7 @@ static void tcp_check_rx(struct si_state *si) - #endif - msg.msg_control = NULL; - -- rc = si->SOCK_PROT(tcp_sk)->recvmsg(NULL, si->tcp_sk, &msg, pktlen, 1, 0, NULL); -+ rc = si->SOCK_PROT(tcp_sk)->recvmsg(si->tcp_sk, &msg, pktlen, 1, 0, NULL); - - if (rc < 0) { - printk(KERN_INFO "nslink: CheckRxTcp recvmsg err %d\n", rc); -@@ -4155,7 +4156,7 @@ static void tcp_send_packet(struct si_state *si, int len) - oldfs = get_fs(); - set_fs(KERNEL_DS); - -- rc = si->tcp_sock->ops->sendmsg(NULL, si->tcp_sock, &msg, len); -+ rc = si->tcp_sock->ops->sendmsg(si->tcp_sock, &msg, len); - - set_fs(oldfs); - -@@ -4785,7 +4786,7 @@ static int free_si_box(int boxid) +@@ -4799,7 +4800,7 @@ static int free_si_box(int boxid) info = nrp_table[i + si->base_port]; if (!info) continue; @@ -70,7 +52,7 @@ index 6de4618..d67d8b0 100755 DebugOpenErr("Attempt to free_si_box() with port open\n"); return -EBUSY; } -@@ -5007,7 +5008,7 @@ static int port_proc_show(struct seq_file *m, void *v) +@@ -5021,7 +5022,7 @@ static int port_proc_show(struct seq_file *m, void *v) for (i=0; i<NumElements(nrp_table); ++i) { struct nr_port *info = nrp_table[i]; if (info) { |