!!! Changed protocol order in af_can.h.

Added comments to Kconfig. Cosmetics.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@22 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/Kconfig b/kernel/2.6/drivers/net/can/Kconfig
index a06b4e715a2107891e70f9c7de6902f5e76310a6..520c486ae60f57d36267ba8636ec5a95f396dd8d 100644 (file)
--- a/kernel/2.6/drivers/net/can/Kconfig
+++ b/kernel/2.6/drivers/net/can/Kconfig
@@ -2,11 +2,11 @@ menu "CAN Device Drivers"
        depends on CAN
 
 config CAN_VCAN
-       tristate "Virtual Local Interface (vcan)"
+       tristate "Virtual Local CAN Interface (vcan)"
        depends on CAN
        default N
        ---help---
-         Similar to the network loopback devices, loopcan offers a
+         Similar to the network loopback devices, vcan offers a
          virtual local CAN interface.
 
 config CAN_DEBUG_DEVICES

diff --git a/kernel/2.6/include/linux/can/af_can.h b/kernel/2.6/include/linux/can/af_can.h
index 95add3f5a3e11d07e1b10b9e8d0f6658fd12257b..b083efa625d0655262f29cd31cddc13a632350b3 100644 (file)
--- a/kernel/2.6/include/linux/can/af_can.h
+++ b/kernel/2.6/include/linux/can/af_can.h
@@ -63,10 +63,10 @@
 #define AF_CAN         PF_CAN
 
 /* particular protocols of the protocol family PF_CAN */
-#define CAN_TP16       1 /* VAG Transport Protocol v1.6 */
-#define CAN_TP20       2 /* VAG Transport Protocol v2.0 */
-#define CAN_RAW                3 /* RAW sockets */
-#define CAN_BCM                4 /* Broadcast Manager */
+#define CAN_RAW                1 /* RAW sockets */
+#define CAN_BCM                2 /* Broadcast Manager */
+#define CAN_TP16       3 /* VAG Transport Protocol v1.6 */
+#define CAN_TP20       4 /* VAG Transport Protocol v2.0 */
 #define CAN_MCNET      5 /* Bosch MCNet */
 #define CAN_ISOTP      6 /* ISO 15765-2 Transport Protocol */
 #define CAN_BAP                7 /* VAG Bedien- und Anzeigeprotokoll */

diff --git a/kernel/2.6/net/can/Kconfig b/kernel/2.6/net/can/Kconfig
index e63a84d1631f46bb1d4a5191b7db7071644ffa5a..f0e946c5612c832be0d47d4b3c00f2002b0f4cd4 100644 (file)
--- a/kernel/2.6/net/can/Kconfig
+++ b/kernel/2.6/net/can/Kconfig
@@ -16,7 +16,7 @@ menuconfig CAN
          specific driver for your controller(s) below.
 
          This CAN support can also be built as a module.  If so, the module
-         will be called can-core.
+         will be called can.ko.
 
 config CAN_RAW
        tristate "Raw CAN Protocol"
@@ -25,14 +25,22 @@ config CAN_RAW
        ---help---
          The Raw CAN protocol option offers access to the CAN bus via
          the BSD socket API. You probably want to use the raw socket in
-         most cases where no higher level protocol is being used. To
-         send raw CAN packets, use AF_CAN and CAN_PROTO_RAW.
+         most cases where no higher level protocol is being used. The raw 
+         socket has several filter options e.g. ID-Masking / Errorframes.
+         To receive/send raw CAN messages, use AF_CAN with protocol CAN_RAW.
 
 config CAN_BCM
-       tristate "Broadcast Manager (BCM) for LLCF"
+       tristate "Broadcast Manager (BCM)"
        depends on CAN
        default N
-
+       ---help---
+         The Broadcast Manager offers content filtering, timeout monitoring,
+         sending of RTR-frames and cyclic CAN messages without permanent user
+         interaction. The BCM can be 'programmed' via the BSD socket API and
+         informs you on demand e.g. only on content updates / timeouts.
+         You probably want to use the bcm socket in most cases where cyclic
+         CAN messages are used on the bus (e.g. in automotive environments).
+         To use the Broadcast Manager, use AF_CAN with protocol CAN_BCM.
 
 config CAN_DEBUG_CORE
        bool "CAN Core debugging messages"