Introduced new functions:

[socketcan-devel.git] / can-utils / slcan_attach.c

diff --git a/can-utils/slcan_attach.c b/can-utils/slcan_attach.c
index 5ee6acd7281430f8dd9ad3b673639f9783fe63bf..bfeaa8e235c854395f7fc42e0ed46e81de8fe2ae 100644 (file)
--- a/can-utils/slcan_attach.c
+++ b/can-utils/slcan_attach.c
@@ -5,15 +5,14 @@
 /*
  * slcan_attach.c - userspace tool for serial line CAN interface driver SLCAN
  *
- * Copyright (c) 2002-2005 Volkswagen Group Electronic Research
+ * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, the following disclaimer and
- *    the referenced file 'COPYING'.
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
@@ -23,8 +22,8 @@
  *
  * Alternatively, provided that this notice is retained in full, this
  * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2 as distributed in the 'COPYING'
- * file from the main directory of the linux kernel source.
+ * Public License ("GPL") version 2, in which case the provisions of the
+ * GPL apply INSTEAD OF those given above.
  *
  * The provided data structures and external interfaces from this code
  * are not restricted to be used by modules with a GPL compatible license.
@@ -56,7 +55,10 @@
 //#include <asm/termios.h> /* ldiscs for each arch up to 2.6.20 */
 
 #ifndef N_SLCAN
-#define N_SLCAN 17 /* bad hack until it's not inside the Kernel */
+#error Your kernel includes do not provide the needed line discipline.
+#error This is a normal behaviour for Kernel versions < v2.6.25 .
+#error You might update or patch your kernel OR you can just ignore
+#error this compilation failure if you do not need the slcan driver.
 #endif
 
 void usage(char *name)