diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-01 02:26:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-01 02:26:38 -0700 |
| commit | 49259d34c52df6be482fefca946debe28ba9a2f6 (patch) | |
| tree | 2d1eb83ba4322b94630b2a78b3b612a183b1da38 /net/irda | |
| parent | 3b582cc14c50f71eabf1c3cada05acb8dc9f457c (diff) | |
| download | linux-stable-49259d34c52df6be482fefca946debe28ba9a2f6.tar.gz linux-stable-49259d34c52df6be482fefca946debe28ba9a2f6.tar.bz2 linux-stable-49259d34c52df6be482fefca946debe28ba9a2f6.zip | |
[IRDA] IRNET: Fix build when TCGETS2 is defined.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irnet/irnet_ppp.c | 10 |
1 files changed, 10 insertions, 0 deletions
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; |