From: David S. Miller Date: Thu, 1 Nov 2007 09:26:38 +0000 (-0700) Subject: [IRDA] IRNET: Fix build when TCGETS2 is defined. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=49259d34c52df6be482fefca946debe28ba9a2f6;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [IRDA] IRNET: Fix build when TCGETS2 is defined. Signed-off-by: David S. Miller --- diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index 2f9f8dce5a69..e0eab5927c4f 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c @@ -731,15 +731,25 @@ dev_irnet_ioctl(struct inode * inode, /* Get termios */ case TCGETS: DEBUG(FS_INFO, "Get termios.\n"); +#ifndef TCGETS2 if(kernel_termios_to_user_termios((struct termios __user *)argp, &ap->termios)) break; +#else + if(kernel_termios_to_user_termios_1((struct termios __user *)argp, &ap->termios)) + break; +#endif err = 0; break; /* Set termios */ case TCSETSF: DEBUG(FS_INFO, "Set termios.\n"); +#ifndef TCGETS2 if(user_termios_to_kernel_termios(&ap->termios, (struct termios __user *)argp)) break; +#else + if(user_termios_to_kernel_termios_1(&ap->termios, (struct termios __user *)argp)) + break; +#endif err = 0; break;