patches/2.6.23.diff

   1 diff -ru linux-2.6.23-vanilla/CREDITS linux-2.6.23/CREDITS
   2 --- linux-2.6.23-vanilla/CREDITS        2007-10-09 22:31:38.000000000 +0200
   3 +++ linux-2.6.23/CREDITS        2008-05-07 11:44:21.000000000 +0200
   4 @@ -1331,6 +1331,14 @@
   5  S: 5623 HZ Eindhoven
   6  S: The Netherlands
   7
   8 +N: Oliver Hartkopp
   9 +E: oliver.hartkopp@volkswagen.de
  10 +W: http://www.volkswagen.de
  11 +D: Controller Area Network (network layer core)
  12 +S: Brieffach 1776
  13 +S: 38436 Wolfsburg
  14 +S: Germany
  15 +
  16  N: Andrew Haylett
  17  E: ajh@primag.co.uk
  18  D: Selection mechanism
  19 @@ -3284,6 +3292,14 @@
  20  S: F-35042 Rennes Cedex
  21  S: France
  22
  23 +N: Urs Thuermann
  24 +E: urs.thuermann@volkswagen.de
  25 +W: http://www.volkswagen.de
  26 +D: Controller Area Network (network layer core)
  27 +S: Brieffach 1776
  28 +S: 38436 Wolfsburg
  29 +S: Germany
  30 +
  31  N: Jon Tombs
  32  E: jon@gte.esi.us.es
  33  W: http://www.esi.us.es/~jon
  34 diff -ru linux-2.6.23-vanilla/drivers/net/Makefile linux-2.6.23/drivers/net/Makefile
  35 --- linux-2.6.23-vanilla/drivers/net/Makefile   2007-10-09 22:31:38.000000000 +0200
  36 +++ linux-2.6.23/drivers/net/Makefile   2008-05-07 11:44:21.000000000 +0200
  37 @@ -8,6 +8,7 @@
  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 -ru linux-2.6.23-vanilla/include/linux/if_arp.h linux-2.6.23/include/linux/if_arp.h
  46 --- linux-2.6.23-vanilla/include/linux/if_arp.h 2007-10-09 22:31:38.000000000 +0200
  47 +++ linux-2.6.23/include/linux/if_arp.h 2008-05-07 11:44:21.000000000 +0200
  48 @@ -52,6 +52,7 @@
  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 -ru linux-2.6.23-vanilla/include/linux/if_ether.h linux-2.6.23/include/linux/if_ether.h
  57 --- linux-2.6.23-vanilla/include/linux/if_ether.h       2007-10-09 22:31:38.000000000 +0200
  58 +++ linux-2.6.23/include/linux/if_ether.h       2008-05-07 11:44:21.000000000 +0200
  59 @@ -90,6 +90,7 @@
  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 -ru linux-2.6.23-vanilla/include/linux/socket.h linux-2.6.23/include/linux/socket.h
  68 --- linux-2.6.23-vanilla/include/linux/socket.h 2007-10-09 22:31:38.000000000 +0200
  69 +++ linux-2.6.23/include/linux/socket.h 2008-05-07 11:44:21.000000000 +0200
  70 @@ -185,6 +185,7 @@
  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                 */
  78 @@ -220,6 +221,7 @@
  79  #define PF_PPPOX       AF_PPPOX
  80  #define PF_WANPIPE     AF_WANPIPE
  81  #define PF_LLC         AF_LLC
  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 -ru linux-2.6.23-vanilla/include/linux/tty.h linux-2.6.23/include/linux/tty.h
  87 --- linux-2.6.23-vanilla/include/linux/tty.h    2007-10-09 22:31:38.000000000 +0200
  88 +++ linux-2.6.23/include/linux/tty.h    2008-05-07 11:44:21.000000000 +0200
  89 @@ -24,7 +24,7 @@
  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 */
  93 -#define NR_LDISCS              17
  94 +#define NR_LDISCS              18
  95
  96  /* line disciplines */
  97  #define N_TTY          0
  98 @@ -45,6 +45,7 @@
  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 */
 103
 104  /*
 105   * This character is the same as _POSIX_VDISABLE: it cannot be used as
 106 diff -ru linux-2.6.23-vanilla/MAINTAINERS linux-2.6.23/MAINTAINERS
 107 --- linux-2.6.23-vanilla/MAINTAINERS    2007-10-09 22:31:38.000000000 +0200
 108 +++ linux-2.6.23/MAINTAINERS    2008-05-07 11:44:21.000000000 +0200
 109 @@ -967,6 +967,15 @@
 110  L:     video4linux-list@redhat.com
 111  S:     Maintained
 112
 113 +CAN NETWORK LAYER
 114 +P:     Urs Thuermann
 115 +M:     urs.thuermann@volkswagen.de
 116 +P:     Oliver Hartkopp
 117 +M:     oliver.hartkopp@volkswagen.de
 118 +L:     socketcan-core@lists.berlios.de
 119 +W:     http://developer.berlios.de/projects/socketcan/
 120 +S:     Maintained
 121 +
 122  CALGARY x86-64 IOMMU
 123  P:     Muli Ben-Yehuda
 124  M:     muli@il.ibm.com
 125 diff -ru linux-2.6.23-vanilla/net/core/sock.c linux-2.6.23/net/core/sock.c
 126 --- linux-2.6.23-vanilla/net/core/sock.c        2007-10-09 22:31:38.000000000 +0200
 127 +++ linux-2.6.23/net/core/sock.c        2008-05-07 11:44:21.000000000 +0200
 128 @@ -153,7 +153,7 @@
 129    "sk_lock-AF_ASH"   , "sk_lock-AF_ECONET"   , "sk_lock-AF_ATMSVC"   ,
 130    "sk_lock-21"       , "sk_lock-AF_SNA"      , "sk_lock-AF_IRDA"     ,
 131    "sk_lock-AF_PPPOX" , "sk_lock-AF_WANPIPE"  , "sk_lock-AF_LLC"      ,
 132 -  "sk_lock-27"       , "sk_lock-28"          , "sk_lock-29"          ,
 133 +  "sk_lock-27"       , "sk_lock-28"          , "sk_lock-AF_CAN"      ,
 134    "sk_lock-AF_TIPC"  , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV"        ,
 135    "sk_lock-AF_RXRPC" , "sk_lock-AF_MAX"
 136  };
 137 @@ -167,7 +167,7 @@
 138    "slock-AF_ASH"   , "slock-AF_ECONET"   , "slock-AF_ATMSVC"   ,
 139    "slock-21"       , "slock-AF_SNA"      , "slock-AF_IRDA"     ,
 140    "slock-AF_PPPOX" , "slock-AF_WANPIPE"  , "slock-AF_LLC"      ,
 141 -  "slock-27"       , "slock-28"          , "slock-29"          ,
 142 +  "slock-27"       , "slock-28"          , "slock-AF_CAN"      ,
 143    "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,
 144    "slock-AF_RXRPC" , "slock-AF_MAX"
 145  };
 146 diff -ru linux-2.6.23-vanilla/net/Kconfig linux-2.6.23/net/Kconfig
 147 --- linux-2.6.23-vanilla/net/Kconfig    2007-10-09 22:31:38.000000000 +0200
 148 +++ linux-2.6.23/net/Kconfig    2008-05-07 11:44:21.000000000 +0200
 149 @@ -210,6 +210,7 @@
 150  endmenu
 151
 152  source "net/ax25/Kconfig"
 153 +source "net/can/Kconfig"
 154  source "net/irda/Kconfig"
 155  source "net/bluetooth/Kconfig"
 156  source "net/rxrpc/Kconfig"
 157 diff -ru linux-2.6.23-vanilla/net/Makefile linux-2.6.23/net/Makefile
 158 --- linux-2.6.23-vanilla/net/Makefile   2007-10-09 22:31:38.000000000 +0200
 159 +++ linux-2.6.23/net/Makefile   2008-05-07 11:44:21.000000000 +0200
 160 @@ -34,6 +34,7 @@
 161  obj-$(CONFIG_NETROM)           += netrom/
 162  obj-$(CONFIG_ROSE)             += rose/
 163  obj-$(CONFIG_AX25)             += ax25/
 164 +obj-$(CONFIG_CAN)              += can/
 165  obj-$(CONFIG_IRDA)             += irda/
 166  obj-$(CONFIG_BT)               += bluetooth/
 167  obj-$(CONFIG_SUNRPC)           += sunrpc/