1 diff -ruN linux-2.6.21/CREDITS linux/CREDITS
2 --- linux-2.6.21/CREDITS 2007-04-25 08:17:49.000000000 +0000
3 +++ linux/CREDITS 2007-04-25 08:21:39.000000000 +0000
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 -ruN linux-2.6.21/MAINTAINERS linux/MAINTAINERS
35 --- linux-2.6.21/MAINTAINERS 2007-04-25 08:17:49.000000000 +0000
36 +++ linux/MAINTAINERS 2007-04-25 08:21:39.000000000 +0000
38 T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
43 +M: urs.thuermann@volkswagen.de
45 +M: oliver.hartkopp@volkswagen.de
46 +L: socketcan-core@lists.berlios.de
47 +W: http://developer.berlios.de/projects/socketcan/
53 diff -ruN linux-2.6.21/drivers/net/Makefile linux/drivers/net/Makefile
54 --- linux-2.6.21/drivers/net/Makefile 2007-04-25 08:17:52.000000000 +0000
55 +++ linux/drivers/net/Makefile 2007-04-25 08:21:39.000000000 +0000
57 obj-$(CONFIG_CHELSIO_T1) += chelsio/
58 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
59 obj-$(CONFIG_EHEA) += ehea/
60 +obj-$(CONFIG_CAN) += can/
61 obj-$(CONFIG_BONDING) += bonding/
62 obj-$(CONFIG_ATL1) += atl1/
63 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
64 diff -ruN linux-2.6.21/include/linux/if_arp.h linux/include/linux/if_arp.h
65 --- linux-2.6.21/include/linux/if_arp.h 2007-04-13 20:48:14.000000000 +0000
66 +++ linux/include/linux/if_arp.h 2007-04-25 08:21:39.000000000 +0000
68 #define ARPHRD_ROSE 270
69 #define ARPHRD_X25 271 /* CCITT X.25 */
70 #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */
71 +#define ARPHRD_CAN 280 /* Controller Area Network */
72 #define ARPHRD_PPP 512
73 #define ARPHRD_CISCO 513 /* Cisco HDLC */
74 #define ARPHRD_HDLC ARPHRD_CISCO
75 diff -ruN linux-2.6.21/include/linux/if_ether.h linux/include/linux/if_ether.h
76 --- linux-2.6.21/include/linux/if_ether.h 2007-04-13 20:48:14.000000000 +0000
77 +++ linux/include/linux/if_ether.h 2007-04-25 08:21:39.000000000 +0000
79 #define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
80 #define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
81 #define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
82 +#define ETH_P_CAN 0x000C /* Controller Area Network */
83 #define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
84 #define ETH_P_TR_802_2 0x0011 /* 802.2 frames */
85 #define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
86 diff -ruN linux-2.6.21/include/linux/socket.h linux/include/linux/socket.h
87 --- linux-2.6.21/include/linux/socket.h 2007-04-25 08:17:54.000000000 +0000
88 +++ linux/include/linux/socket.h 2007-04-25 08:21:39.000000000 +0000
90 #define AF_PPPOX 24 /* PPPoX sockets */
91 #define AF_WANPIPE 25 /* Wanpipe API Sockets */
92 #define AF_LLC 26 /* Linux LLC */
93 +#define AF_CAN 29 /* Controller Area Network */
94 #define AF_TIPC 30 /* TIPC sockets */
95 #define AF_BLUETOOTH 31 /* Bluetooth sockets */
96 #define AF_IUCV 32 /* IUCV sockets */
98 #define PF_PPPOX AF_PPPOX
99 #define PF_WANPIPE AF_WANPIPE
100 #define PF_LLC AF_LLC
101 +#define PF_CAN AF_CAN
102 #define PF_TIPC AF_TIPC
103 #define PF_BLUETOOTH AF_BLUETOOTH
104 #define PF_IUCV AF_IUCV
105 diff -ruN linux-2.6.21/include/linux/tty.h linux/include/linux/tty.h
106 --- linux-2.6.21/include/linux/tty.h 2007-04-25 08:17:54.000000000 +0000
107 +++ linux/include/linux/tty.h 2007-04-25 08:21:39.000000000 +0000
109 #define NR_PTYS CONFIG_LEGACY_PTY_COUNT /* Number of legacy ptys */
110 #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */
111 #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */
112 -#define NR_LDISCS 17
113 +#define NR_LDISCS 18
115 /* line disciplines */
118 #define N_SYNC_PPP 14 /* synchronous PPP */
119 #define N_HCI 15 /* Bluetooth HCI UART */
120 #define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */
121 +#define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */
124 * This character is the same as _POSIX_VDISABLE: it cannot be used as
125 diff -ruN linux-2.6.21/net/Kconfig linux/net/Kconfig
126 --- linux-2.6.21/net/Kconfig 2007-04-25 08:17:54.000000000 +0000
127 +++ linux/net/Kconfig 2007-04-25 08:21:39.000000000 +0000
131 source "net/ax25/Kconfig"
132 +source "net/can/Kconfig"
133 source "net/irda/Kconfig"
134 source "net/bluetooth/Kconfig"
135 source "net/ieee80211/Kconfig"
136 diff -ruN linux-2.6.21/net/Makefile linux/net/Makefile
137 --- linux-2.6.21/net/Makefile 2007-04-25 08:17:54.000000000 +0000
138 +++ linux/net/Makefile 2007-04-25 08:21:39.000000000 +0000
140 obj-$(CONFIG_NETROM) += netrom/
141 obj-$(CONFIG_ROSE) += rose/
142 obj-$(CONFIG_AX25) += ax25/
143 +obj-$(CONFIG_CAN) += can/
144 obj-$(CONFIG_IRDA) += irda/
145 obj-$(CONFIG_BT) += bluetooth/
146 obj-$(CONFIG_SUNRPC) += sunrpc/