1 diff -u -r a/CREDITS b/CREDITS
2 --- a/CREDITS 2007-03-09 09:51:49.000000000 +0100
3 +++ b/CREDITS 2007-03-09 13:19:16.000000000 +0100
9 +E: oliver.hartkopp@volkswagen.de
10 +W: http://www.volkswagen.de
11 +D: Controller Area Network (network layer core)
18 D: Selection mechanism
19 @@ -3277,6 +3285,14 @@
20 S: F-35042 Rennes Cedex
24 +E: urs.thuermann@volkswagen.de
25 +W: http://www.volkswagen.de
26 +D: Controller Area Network (network layer core)
33 W: http://www.esi.us.es/~jon
34 diff -u -r a/drivers/net/Makefile b/drivers/net/Makefile
35 --- a/drivers/net/Makefile 2007-03-09 09:52:04.000000000 +0100
36 +++ b/drivers/net/Makefile 2007-03-09 13:22:39.000000000 +0100
38 obj-$(CONFIG_CHELSIO_T1) += chelsio/
39 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
40 obj-$(CONFIG_EHEA) += ehea/
41 +obj-$(CONFIG_CAN) += can/
42 obj-$(CONFIG_BONDING) += bonding/
43 obj-$(CONFIG_ATL1) += atl1/
44 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
45 diff -u -r a/include/linux/if_arp.h b/include/linux/if_arp.h
46 --- a/include/linux/if_arp.h 2007-02-04 19:44:54.000000000 +0100
47 +++ b/include/linux/if_arp.h 2007-03-09 13:25:02.000000000 +0100
49 #define ARPHRD_ROSE 270
50 #define ARPHRD_X25 271 /* CCITT X.25 */
51 #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */
52 +#define ARPHRD_CAN 280 /* Controller Area Network */
53 #define ARPHRD_PPP 512
54 #define ARPHRD_CISCO 513 /* Cisco HDLC */
55 #define ARPHRD_HDLC ARPHRD_CISCO
56 diff -u -r a/include/linux/if_ether.h b/include/linux/if_ether.h
57 --- a/include/linux/if_ether.h 2007-02-04 19:44:54.000000000 +0100
58 +++ b/include/linux/if_ether.h 2007-03-09 13:25:46.000000000 +0100
60 #define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
61 #define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
62 #define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
63 +#define ETH_P_CAN 0x000C /* Controller Area Network */
64 #define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
65 #define ETH_P_TR_802_2 0x0011 /* 802.2 frames */
66 #define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
67 diff -u -r a/include/linux/socket.h b/include/linux/socket.h
68 --- a/include/linux/socket.h 2007-03-09 09:52:17.000000000 +0100
69 +++ b/include/linux/socket.h 2007-03-09 13:26:58.000000000 +0100
71 #define AF_PPPOX 24 /* PPPoX sockets */
72 #define AF_WANPIPE 25 /* Wanpipe API Sockets */
73 #define AF_LLC 26 /* Linux LLC */
74 +#define AF_CAN 29 /* Controller Area Network */
75 #define AF_TIPC 30 /* TIPC sockets */
76 #define AF_BLUETOOTH 31 /* Bluetooth sockets */
77 #define AF_IUCV 32 /* IUCV sockets */
79 #define PF_PPPOX AF_PPPOX
80 #define PF_WANPIPE AF_WANPIPE
82 +#define PF_CAN AF_CAN
83 #define PF_TIPC AF_TIPC
84 #define PF_BLUETOOTH AF_BLUETOOTH
85 #define PF_IUCV AF_IUCV
86 diff -u -r a/include/linux/tty.h b/include/linux/tty.h
87 --- a/include/linux/tty.h 2007-03-09 09:52:17.000000000 +0100
88 +++ b/include/linux/tty.h 2007-03-09 13:28:33.000000000 +0100
90 #define NR_PTYS CONFIG_LEGACY_PTY_COUNT /* Number of legacy ptys */
91 #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */
92 #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */
96 /* line disciplines */
99 #define N_SYNC_PPP 14 /* synchronous PPP */
100 #define N_HCI 15 /* Bluetooth HCI UART */
101 #define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */
102 +#define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */
105 * This character is the same as _POSIX_VDISABLE: it cannot be used as
106 diff -u -r a/MAINTAINERS b/MAINTAINERS
107 --- a/MAINTAINERS 2007-03-09 09:51:50.000000000 +0100
108 +++ b/MAINTAINERS 2007-03-09 13:21:51.000000000 +0100
110 T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
115 +M: urs.thuermann@volkswagen.de
117 +M: oliver.hartkopp@volkswagen.de
118 +L: socketcan-core@lists.berlios.de
119 +W: http://developer.berlios.de/projects/socketcan/
125 diff -u -r a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
126 --- a/net/ipv6/addrconf.c 2007-03-09 09:52:20.000000000 +0100
127 +++ b/net/ipv6/addrconf.c 2007-03-09 13:31:50.000000000 +0100
128 @@ -2178,6 +2178,10 @@
129 struct inet6_dev *idev = __in6_dev_get(dev);
132 + /* more non ipv6 compatible dev types to skip here? */
133 + if (dev->type == ARPHRD_CAN)
137 case NETDEV_REGISTER:
139 diff -u -r a/net/Kconfig b/net/Kconfig
140 --- a/net/Kconfig 2007-03-09 09:52:18.000000000 +0100
141 +++ b/net/Kconfig 2007-03-09 13:29:23.000000000 +0100
145 source "net/ax25/Kconfig"
146 +source "net/can/Kconfig"
147 source "net/irda/Kconfig"
148 source "net/bluetooth/Kconfig"
149 source "net/ieee80211/Kconfig"
150 diff -u -r a/net/Makefile b/net/Makefile
151 --- a/net/Makefile 2007-03-09 09:52:18.000000000 +0100
152 +++ b/net/Makefile 2007-03-09 13:29:55.000000000 +0100
154 obj-$(CONFIG_NETROM) += netrom/
155 obj-$(CONFIG_ROSE) += rose/
156 obj-$(CONFIG_AX25) += ax25/
157 +obj-$(CONFIG_CAN) += can/
158 obj-$(CONFIG_IRDA) += irda/
159 obj-$(CONFIG_BT) += bluetooth/
160 obj-$(CONFIG_SUNRPC) += sunrpc/