diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
| commit | 31cbecb4ab538f433145bc5a46f3bea9b9627031 (patch) | |
| tree | d6206d42dea7298f7ef05fd1f7bf474245f0d43a /net/can/Kconfig | |
| parent | 2b72c9ccd22c4a3299e5a358dcd639fb253730f4 (diff) | |
| parent | 278c023a99b0d6b471d0f4a79835c703482e29ac (diff) | |
Merge branch 'osd-devel' into nfs-for-next
Diffstat (limited to 'net/can/Kconfig')
| -rw-r--r-- | net/can/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/can/Kconfig b/net/can/Kconfig index 89395b2c8bca..03200699d274 100644 --- a/net/can/Kconfig +++ b/net/can/Kconfig | |||
| @@ -40,5 +40,16 @@ config CAN_BCM | |||
| 40 | CAN messages are used on the bus (e.g. in automotive environments). | 40 | CAN messages are used on the bus (e.g. in automotive environments). |
| 41 | To use the Broadcast Manager, use AF_CAN with protocol CAN_BCM. | 41 | To use the Broadcast Manager, use AF_CAN with protocol CAN_BCM. |
| 42 | 42 | ||
| 43 | config CAN_GW | ||
| 44 | tristate "CAN Gateway/Router (with netlink configuration)" | ||
| 45 | depends on CAN | ||
| 46 | default N | ||
| 47 | ---help--- | ||
| 48 | The CAN Gateway/Router is used to route (and modify) CAN frames. | ||
| 49 | It is based on the PF_CAN core infrastructure for msg filtering and | ||
| 50 | msg sending and can optionally modify routed CAN frames on the fly. | ||
| 51 | CAN frames can be routed between CAN network interfaces (one hop). | ||
| 52 | They can be modified with AND/OR/XOR/SET operations as configured | ||
| 53 | by the netlink configuration interface known e.g. from iptables. | ||
| 43 | 54 | ||
| 44 | source "drivers/net/can/Kconfig" | 55 | source "drivers/net/can/Kconfig" |