From ca7990919717b8e2c841552139ad221e58e8bb69 Mon Sep 17 00:00:00 2001
From: Jeremiah Mahler <jmmahler@gmail.com>
Date: Fri, 19 Dec 2014 07:22:19 -0800
Subject: [PATCH] use line discipline number from linux/tty.h

The line discipline number is provided in include/linux/tty.h.
Use that instead of a #define in each program.

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
 slcan_attach.c | 5 ++---
 slcand.c       | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/slcan_attach.c b/slcan_attach.c
index 2c95d22..ab8ff0a 100644
--- a/slcan_attach.c
+++ b/slcan_attach.c
@@ -51,8 +51,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <termios.h>
-
-#define LDISC_N_SLCAN 17 /* default slcan line discipline since Kernel 2.6.25 */
+#include <linux/tty.h>
 
 void print_usage(char *prg)
 {
@@ -77,7 +76,7 @@ void print_usage(char *prg)
 int main(int argc, char **argv)
 {
 	int fd;
-	int ldisc = LDISC_N_SLCAN;
+	int ldisc = N_SLCAN;
 	int detach = 0;
 	int waitkey = 0;
 	int send_open = 0;
diff --git a/slcand.c b/slcand.c
index b72fa4e..e5e4752 100644
--- a/slcand.c
+++ b/slcand.c
@@ -37,9 +37,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <termios.h>
-
-/* default slcan line discipline since Kernel 2.6.25 */
-#define LDISC_N_SLCAN 17
+#include <linux/tty.h>
 
 /* Change this to whatever your daemon is called */
 #define DAEMON_NAME "slcand"
@@ -180,7 +178,7 @@ int main(int argc, char *argv[])
 	char *btr = NULL;
 	int run_as_daemon = 1;
 	char *pch;
-	int ldisc = LDISC_N_SLCAN;
+	int ldisc = N_SLCAN;
 	int fd;
 
 	ttypath[0] = '\0';