diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-01 05:26:38 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-01 05:26:38 -0400 |
commit | 49259d34c52df6be482fefca946debe28ba9a2f6 (patch) | |
tree | 2d1eb83ba4322b94630b2a78b3b612a183b1da38 /net/irda/irnet/irnet_ppp.c | |
parent | 3b582cc14c50f71eabf1c3cada05acb8dc9f457c (diff) |
[IRDA] IRNET: Fix build when TCGETS2 is defined.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irnet/irnet_ppp.c')
-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, | |||
731 | /* Get termios */ | 731 | /* Get termios */ |
732 | case TCGETS: | 732 | case TCGETS: |
733 | DEBUG(FS_INFO, "Get termios.\n"); | 733 | DEBUG(FS_INFO, "Get termios.\n"); |
734 | #ifndef TCGETS2 | ||
734 | if(kernel_termios_to_user_termios((struct termios __user *)argp, &ap->termios)) | 735 | if(kernel_termios_to_user_termios((struct termios __user *)argp, &ap->termios)) |
735 | break; | 736 | break; |
737 | #else | ||
738 | if(kernel_termios_to_user_termios_1((struct termios __user *)argp, &ap->termios)) | ||
739 | break; | ||
740 | #endif | ||
736 | err = 0; | 741 | err = 0; |
737 | break; | 742 | break; |
738 | /* Set termios */ | 743 | /* Set termios */ |
739 | case TCSETSF: | 744 | case TCSETSF: |
740 | DEBUG(FS_INFO, "Set termios.\n"); | 745 | DEBUG(FS_INFO, "Set termios.\n"); |
746 | #ifndef TCGETS2 | ||
741 | if(user_termios_to_kernel_termios(&ap->termios, (struct termios __user *)argp)) | 747 | if(user_termios_to_kernel_termios(&ap->termios, (struct termios __user *)argp)) |
742 | break; | 748 | break; |
749 | #else | ||
750 | if(user_termios_to_kernel_termios_1(&ap->termios, (struct termios __user *)argp)) | ||
751 | break; | ||
752 | #endif | ||
743 | err = 0; | 753 | err = 0; |
744 | break; | 754 | break; |
745 | 755 | ||