diff options
Diffstat (limited to 'main/devicemaster-linux-grsec/nslink.patch')
| -rw-r--r-- | main/devicemaster-linux-grsec/nslink.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/main/devicemaster-linux-grsec/nslink.patch b/main/devicemaster-linux-grsec/nslink.patch index 0304bf6c8b..79d7fc444f 100644 --- a/main/devicemaster-linux-grsec/nslink.patch +++ b/main/devicemaster-linux-grsec/nslink.patch @@ -1,5 +1,5 @@ diff --git a/nslink.c b/nslink.c -index 16a4212..e64907d 100755 +index 6de4618..d67d8b0 100755 --- a/nslink.c +++ b/nslink.c @@ -113,6 +113,7 @@ @@ -43,7 +43,25 @@ index 16a4212..e64907d 100755 } static void nrp_set_termios(struct tty_struct *tty, struct ktermios *old_termios) -@@ -4786,7 +4787,7 @@ static int free_si_box(int boxid) +@@ -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) info = nrp_table[i + si->base_port]; if (!info) continue; @@ -52,7 +70,7 @@ index 16a4212..e64907d 100755 DebugOpenErr("Attempt to free_si_box() with port open\n"); return -EBUSY; } -@@ -5008,7 +5009,7 @@ static int port_proc_show(struct seq_file *m, void *v) +@@ -5007,7 +5008,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) { @@ -61,21 +79,3 @@ index 16a4212..e64907d 100755 // Ctrl ... seq_printf(m, (info->control_settings & SC_DATABITS_7) ? "7" : "8"); -@@ -5192,7 +5193,7 @@ static int status_proc_show(struct seq_file *m, void *v) - struct si_state *si; - - seq_printf(m, "Comtrol NS-Link -- version %s (%s)\n",SI_VERSION,SI_DATE); -- seq_printf(m, "Built %s %s\n\n",__DATE__,__TIME__); -+ seq_printf(m, "Build %s\n\n",utsname()->version); - seq_printf(m, "Hub State Address Ports\n"); - seq_printf(m, "--- ------------ ------------------ -----\n"); - -@@ -5381,7 +5382,7 @@ int nrp_init(void) - static struct proc_dir_entry *procdir; - - printk(KERN_INFO "nslink: NS-Link driver, version %s %s\n",SI_VERSION, SI_DATE); -- printk(KERN_INFO "nslink: Built %s %s\n", __DATE__, __TIME__); -+ printk(KERN_INFO "nslink: Build %s\n", utsname()->version); - - // Initialize the array of pointers to our own internal state structures. - memset(nrp_table, 0, sizeof(nrp_table)); |