diff options
| author | Oliver Hartkopp <oliver.hartkopp@volkswagen.de> | 2007-12-16 15:59:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:54:09 -0800 |
| commit | cd05acfe65ed2cf2db683fa9a6adb8d35635263b (patch) | |
| tree | 73cf8541f3ad48bce5078209fb1cc7383e8c2a3b /include/linux/tty.h | |
| parent | 8dbde28d9711475adfe0e9c88505e38743cdc2a7 (diff) | |
| download | kernel_samsung_tuna-cd05acfe65ed2cf2db683fa9a6adb8d35635263b.zip kernel_samsung_tuna-cd05acfe65ed2cf2db683fa9a6adb8d35635263b.tar.gz kernel_samsung_tuna-cd05acfe65ed2cf2db683fa9a6adb8d35635263b.tar.bz2 | |
[CAN]: Allocate protocol numbers for PF_CAN
This patch adds a protocol/address family number, ARP hardware type,
ethernet packet type, and a line discipline number for the SocketCAN
implementation.
Signed-off-by: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
Signed-off-by: Urs Thuermann <urs.thuermann@volkswagen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index defd2ab..402de89 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -23,7 +23,7 @@ */ #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */ #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */ -#define NR_LDISCS 17 +#define NR_LDISCS 18 /* line disciplines */ #define N_TTY 0 @@ -44,6 +44,7 @@ #define N_SYNC_PPP 14 /* synchronous PPP */ #define N_HCI 15 /* Bluetooth HCI UART */ #define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */ +#define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as |