浏览代码

[IRDA] IRNET: Fix build when TCGETS2 is defined.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 17 年之前
父节点
当前提交
49259d34c5
共有 1 个文件被更改,包括 10 次插入0 次删除
  1. 10 0
      net/irda/irnet/irnet_ppp.c

+ 10 - 0
net/irda/irnet/irnet_ppp.c

@@ -731,15 +731,25 @@ dev_irnet_ioctl(struct inode *	inode,
       /* Get termios */
       /* Get termios */
     case TCGETS:
     case TCGETS:
       DEBUG(FS_INFO, "Get termios.\n");
       DEBUG(FS_INFO, "Get termios.\n");
+#ifndef TCGETS2
       if(kernel_termios_to_user_termios((struct termios __user *)argp, &ap->termios))
       if(kernel_termios_to_user_termios((struct termios __user *)argp, &ap->termios))
 	break;
 	break;
+#else
+      if(kernel_termios_to_user_termios_1((struct termios __user *)argp, &ap->termios))
+	break;
+#endif
       err = 0;
       err = 0;
       break;
       break;
       /* Set termios */
       /* Set termios */
     case TCSETSF:
     case TCSETSF:
       DEBUG(FS_INFO, "Set termios.\n");
       DEBUG(FS_INFO, "Set termios.\n");
+#ifndef TCGETS2
       if(user_termios_to_kernel_termios(&ap->termios, (struct termios __user *)argp))
       if(user_termios_to_kernel_termios(&ap->termios, (struct termios __user *)argp))
 	break;
 	break;
+#else
+      if(user_termios_to_kernel_termios_1(&ap->termios, (struct termios __user *)argp))
+	break;
+#endif
       err = 0;
       err = 0;
       break;
       break;