aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Hartkopp <oliver.hartkopp@volkswagen.de>2007-12-16 18:59:24 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:54:09 -0500
commitcd05acfe65ed2cf2db683fa9a6adb8d35635263b (patch)
tree73cf8541f3ad48bce5078209fb1cc7383e8c2a3b
parent8dbde28d9711475adfe0e9c88505e38743cdc2a7 (diff)
[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>
-rw-r--r--include/linux/if.h4
-rw-r--r--include/linux/if_arp.h1
-rw-r--r--include/linux/if_ether.h1
-rw-r--r--include/linux/socket.h2
-rw-r--r--include/linux/tty.h3
-rw-r--r--net/core/sock.c4
6 files changed, 11 insertions, 4 deletions
diff --git a/include/linux/if.h b/include/linux/if.h
index 32bf419351f1..186070d5c544 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -50,7 +50,9 @@
50#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */ 50#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
51#define IFF_DORMANT 0x20000 /* driver signals dormant */ 51#define IFF_DORMANT 0x20000 /* driver signals dormant */
52 52
53#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|\ 53#define IFF_ECHO 0x40000 /* echo sent packets */
54
55#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
54 IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) 56 IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
55 57
56/* Private (from user) interface flags (netdevice->priv_flags). */ 58/* Private (from user) interface flags (netdevice->priv_flags). */
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index ed7b93c3083a..296e8e86e91d 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -52,6 +52,7 @@
52#define ARPHRD_ROSE 270 52#define ARPHRD_ROSE 270
53#define ARPHRD_X25 271 /* CCITT X.25 */ 53#define ARPHRD_X25 271 /* CCITT X.25 */
54#define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */ 54#define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */
55#define ARPHRD_CAN 280 /* Controller Area Network */
55#define ARPHRD_PPP 512 56#define ARPHRD_PPP 512
56#define ARPHRD_CISCO 513 /* Cisco HDLC */ 57#define ARPHRD_CISCO 513 /* Cisco HDLC */
57#define ARPHRD_HDLC ARPHRD_CISCO 58#define ARPHRD_HDLC ARPHRD_CISCO
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 5f9297793661..cc002cbbdc26 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -90,6 +90,7 @@
90#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ 90#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
91#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ 91#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
92#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ 92#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
93#define ETH_P_CAN 0x000C /* Controller Area Network */
93#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ 94#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
94#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ 95#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */
95#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ 96#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index c22ef1c1afb8..eb5bdd59a644 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -185,6 +185,7 @@ struct ucred {
185#define AF_PPPOX 24 /* PPPoX sockets */ 185#define AF_PPPOX 24 /* PPPoX sockets */
186#define AF_WANPIPE 25 /* Wanpipe API Sockets */ 186#define AF_WANPIPE 25 /* Wanpipe API Sockets */
187#define AF_LLC 26 /* Linux LLC */ 187#define AF_LLC 26 /* Linux LLC */
188#define AF_CAN 29 /* Controller Area Network */
188#define AF_TIPC 30 /* TIPC sockets */ 189#define AF_TIPC 30 /* TIPC sockets */
189#define AF_BLUETOOTH 31 /* Bluetooth sockets */ 190#define AF_BLUETOOTH 31 /* Bluetooth sockets */
190#define AF_IUCV 32 /* IUCV sockets */ 191#define AF_IUCV 32 /* IUCV sockets */
@@ -220,6 +221,7 @@ struct ucred {
220#define PF_PPPOX AF_PPPOX 221#define PF_PPPOX AF_PPPOX
221#define PF_WANPIPE AF_WANPIPE 222#define PF_WANPIPE AF_WANPIPE
222#define PF_LLC AF_LLC 223#define PF_LLC AF_LLC
224#define PF_CAN AF_CAN
223#define PF_TIPC AF_TIPC 225#define PF_TIPC AF_TIPC
224#define PF_BLUETOOTH AF_BLUETOOTH 226#define PF_BLUETOOTH AF_BLUETOOTH
225#define PF_IUCV AF_IUCV 227#define PF_IUCV AF_IUCV
diff --git a/include/linux/tty.h b/include/linux/tty.h
index defd2ab72449..402de892b3ed 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -23,7 +23,7 @@
23 */ 23 */
24#define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */ 24#define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */
25#define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */ 25#define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */
26#define NR_LDISCS 17 26#define NR_LDISCS 18
27 27
28/* line disciplines */ 28/* line disciplines */
29#define N_TTY 0 29#define N_TTY 0
@@ -44,6 +44,7 @@
44#define N_SYNC_PPP 14 /* synchronous PPP */ 44#define N_SYNC_PPP 14 /* synchronous PPP */
45#define N_HCI 15 /* Bluetooth HCI UART */ 45#define N_HCI 15 /* Bluetooth HCI UART */
46#define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */ 46#define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */
47#define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */
47 48
48/* 49/*
49 * This character is the same as _POSIX_VDISABLE: it cannot be used as 50 * This character is the same as _POSIX_VDISABLE: it cannot be used as
diff --git a/net/core/sock.c b/net/core/sock.c
index 98b243a5b323..c9305a861760 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -154,7 +154,7 @@ static const char *af_family_key_strings[AF_MAX+1] = {
154 "sk_lock-AF_ASH" , "sk_lock-AF_ECONET" , "sk_lock-AF_ATMSVC" , 154 "sk_lock-AF_ASH" , "sk_lock-AF_ECONET" , "sk_lock-AF_ATMSVC" ,
155 "sk_lock-21" , "sk_lock-AF_SNA" , "sk_lock-AF_IRDA" , 155 "sk_lock-21" , "sk_lock-AF_SNA" , "sk_lock-AF_IRDA" ,
156 "sk_lock-AF_PPPOX" , "sk_lock-AF_WANPIPE" , "sk_lock-AF_LLC" , 156 "sk_lock-AF_PPPOX" , "sk_lock-AF_WANPIPE" , "sk_lock-AF_LLC" ,
157 "sk_lock-27" , "sk_lock-28" , "sk_lock-29" , 157 "sk_lock-27" , "sk_lock-28" , "sk_lock-AF_CAN" ,
158 "sk_lock-AF_TIPC" , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV" , 158 "sk_lock-AF_TIPC" , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV" ,
159 "sk_lock-AF_RXRPC" , "sk_lock-AF_MAX" 159 "sk_lock-AF_RXRPC" , "sk_lock-AF_MAX"
160}; 160};
@@ -168,7 +168,7 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = {
168 "slock-AF_ASH" , "slock-AF_ECONET" , "slock-AF_ATMSVC" , 168 "slock-AF_ASH" , "slock-AF_ECONET" , "slock-AF_ATMSVC" ,
169 "slock-21" , "slock-AF_SNA" , "slock-AF_IRDA" , 169 "slock-21" , "slock-AF_SNA" , "slock-AF_IRDA" ,
170 "slock-AF_PPPOX" , "slock-AF_WANPIPE" , "slock-AF_LLC" , 170 "slock-AF_PPPOX" , "slock-AF_WANPIPE" , "slock-AF_LLC" ,
171 "slock-27" , "slock-28" , "slock-29" , 171 "slock-27" , "slock-28" , "slock-AF_CAN" ,
172 "slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" , 172 "slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" ,
173 "slock-AF_RXRPC" , "slock-AF_MAX" 173 "slock-AF_RXRPC" , "slock-AF_MAX"
174}; 174};