1 diff -ruN linux-2.6.20.3/CREDITS linux/CREDITS
2 --- linux-2.6.20.3/CREDITS 2007-03-19 10:11:40.000000000 +0000
3 +++ linux/CREDITS 2007-03-19 10:32:08.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 @@ -3267,6 +3275,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.20.3/MAINTAINERS linux/MAINTAINERS
35 --- linux-2.6.20.3/MAINTAINERS 2007-03-19 10:11:41.000000000 +0000
36 +++ linux/MAINTAINERS 2007-03-19 10:32:08.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.20.3/drivers/net/Makefile linux/drivers/net/Makefile
54 --- linux-2.6.20.3/drivers/net/Makefile 2007-03-19 10:11:45.000000000 +0000
55 +++ linux/drivers/net/Makefile 2007-03-19 10:32:08.000000000 +0000
57 obj-$(CONFIG_IXGB) += ixgb/
58 obj-$(CONFIG_CHELSIO_T1) += chelsio/
59 obj-$(CONFIG_EHEA) += ehea/
60 +obj-$(CONFIG_CAN) += can/
61 obj-$(CONFIG_BONDING) += bonding/
62 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
64 diff -ruN linux-2.6.20.3/include/linux/if_arp.h linux/include/linux/if_arp.h
65 --- linux-2.6.20.3/include/linux/if_arp.h 2007-03-19 10:11:25.000000000 +0000
66 +++ linux/include/linux/if_arp.h 2007-03-19 10:32:08.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.20.3/include/linux/if_ether.h linux/include/linux/if_ether.h
76 --- linux-2.6.20.3/include/linux/if_ether.h 2006-06-18 01:49:35.000000000 +0000
77 +++ linux/include/linux/if_ether.h 2007-03-19 10:32:08.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.20.3/include/linux/socket.h linux/include/linux/socket.h
87 --- linux-2.6.20.3/include/linux/socket.h 2007-03-19 10:11:50.000000000 +0000
88 +++ linux/include/linux/socket.h 2007-03-19 10:32:08.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_MAX 32 /* For now.. */
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_MAX AF_MAX
105 diff -ruN linux-2.6.20.3/net/Kconfig linux/net/Kconfig
106 --- linux-2.6.20.3/net/Kconfig 2007-03-19 10:11:51.000000000 +0000
107 +++ linux/net/Kconfig 2007-03-19 10:32:08.000000000 +0000
111 source "net/ax25/Kconfig"
112 +source "net/can/Kconfig"
113 source "net/irda/Kconfig"
114 source "net/bluetooth/Kconfig"
115 source "net/ieee80211/Kconfig"
116 diff -ruN linux-2.6.20.3/net/Makefile linux/net/Makefile
117 --- linux-2.6.20.3/net/Makefile 2007-03-19 10:11:26.000000000 +0000
118 +++ linux/net/Makefile 2007-03-19 10:32:08.000000000 +0000
120 obj-$(CONFIG_NETROM) += netrom/
121 obj-$(CONFIG_ROSE) += rose/
122 obj-$(CONFIG_AX25) += ax25/
123 +obj-$(CONFIG_CAN) += can/
124 obj-$(CONFIG_IRDA) += irda/
125 obj-$(CONFIG_BT) += bluetooth/
126 obj-$(CONFIG_SUNRPC) += sunrpc/
127 diff -ruN linux-2.6.20.3/net/ipv6/addrconf.c linux/net/ipv6/addrconf.c
128 --- linux-2.6.20.3/net/ipv6/addrconf.c 2007-03-19 10:29:34.000000000 +0000
129 +++ linux/net/ipv6/addrconf.c 2007-03-19 10:32:08.000000000 +0000
130 @@ -2242,6 +2242,10 @@
131 struct inet6_dev *idev = __in6_dev_get(dev);
134 + /* more non ipv6 compatible dev types to skip here? */
135 + if (dev->type == ARPHRD_CAN)