diff --git a/nslink.c b/nslink.c index bf4a922..1672325 100755 --- a/nslink.c +++ b/nslink.c @@ -117,6 +117,7 @@ #include #include #include +#include #if LINUX_VERSION_CODE >= VERSION_CODE(2,6,36) && LINUX_VERSION_CODE < VERSION_CODE(2,6,39) #include #endif @@ -2874,7 +2875,7 @@ static int nrp_open(struct tty_struct *tty, struct file *filp) info = nrp_table[line]; - DebugOpen("ttySI%d (count=%d) enter\n", line, info->port.count); + DebugOpen("ttySI%d (count=%d) enter\n", line, info->port.count.counter); if (!info->si) { DebugOpenErr("ttySI%d info->si==NULL: return -ENODEV\n", line); @@ -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) - DebugOpenErr("ttySI%d (count=%d) return %d\n", line, info->port.count,ret); + DebugOpenErr("ttySI%d (count=%d) return %d\n", line, info->port.count.counter,ret); else - DebugOpen("ttySI%d (count=%d) return %d\n", line, info->port.count,ret); + DebugOpen("ttySI%d (count=%d) return %d\n", line, info->port.count.counter,ret); return ret; } @@ -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; - DebugOpen("ttySI%d (count=%d) enter\n", info->line, info->port.count); + DebugOpen("ttySI%d (count=%d) enter\n", info->line, info->port.count.counter); tty_port_close(&info->port, tty, filp); - DebugOpen("ttySI%d (count=%d) return\n", info->line, info->port.count); + DebugOpen("ttySI%d (count=%d) return\n", info->line, info->port.count.counter); } static void nrp_set_termios(struct tty_struct *tty, struct ktermios *old_termios) @@ -4799,7 +4800,7 @@ static int free_si_box(int boxid) info = nrp_table[i + si->base_port]; if (!info) continue; - if (info->port.count) { + if (info->port.count.counter) { DebugOpenErr("Attempt to free_si_box() with port open\n"); return -EBUSY; } @@ -5021,7 +5022,7 @@ static int port_proc_show(struct seq_file *m, void *v) for (i=0; iport.count, info->rsmode, info->baud_rate); + seq_printf(m,"%3d %4d %02x %6d ", i, info->port.count.counter, info->rsmode, info->baud_rate); // Ctrl ... seq_printf(m, (info->control_settings & SC_DATABITS_7) ? "7" : "8");