sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 06:20:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update includes to Linux 3.6 with CAN FD support.

Browse Source 
There has been a change with __kernel_sa_family_t in Linux 3.1 which was not
adopted in this update so far to be backward compatible with old environments.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
This commit is contained in:
Oliver Hartkopp
2012-11-14 18:52:01 +01:00
parent 9b99fafe1a
commit a2b13452c7
6 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/socketcan/can/bcm.h
+3 -4
View File
@@ -3,19 +3,18 @@
*
* Definitions for CAN Broadcast Manager (BCM)
*
* $Id$
*
* Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
* Copyright (c) 2002-2007 Volkswagen Group Electronic Research
* All rights reserved.
*
* Send feedback to <linux-can@vger.kernel.org>
*
*/
#ifndef CAN_BCM_H
#define CAN_BCM_H
#include <linux/types.h>
#include <socketcan/can.h>
/**
* struct bcm_msg_head - head of messages to/from the broadcast manager
* @opcode: opcode, see enum below.
include/socketcan/can/error.h
+2 -6
View File
@@ -1,22 +1,18 @@
/*
* socketcan/can/error.h
*
* Definitions of the CAN error frame to be filtered and passed to the user.
*
* $Id$
* Definitions of the CAN error messages to be filtered and passed to the user.
*
* Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
* Copyright (c) 2002-2007 Volkswagen Group Electronic Research
* All rights reserved.
*
* Send feedback to <linux-can@vger.kernel.org>
*
*/
#ifndef CAN_ERROR_H
#define CAN_ERROR_H
#define CAN_ERR_DLC 8 /* dlc for error frames */
#define CAN_ERR_DLC 8 /* dlc for error message frames */
/* error class (mask) in can_id */
#define CAN_ERR_TX_TIMEOUT 0x00000001U /* TX timeout (by netdevice driver) */
include/socketcan/can/gw.h
-4
View File
@@ -3,14 +3,10 @@
*
* Definitions for CAN frame Gateway/Router/Bridge
*
* $Id$
*
* Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
* Copyright (c) 2011 Volkswagen Group Electronic Research
* All rights reserved.
*
* Send feedback to <linux-can@vger.kernel.org>
*
*/
#ifndef CAN_GW_H
include/socketcan/can/netlink.h
-4
View File
@@ -3,12 +3,8 @@
*
* Definitions for the CAN netlink interface
*
* $Id: dev.h 939 2009-02-14 14:30:19Z wolf $
*
* Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
*
* Send feedback to <linux-can@vger.kernel.org>
*
*/
#ifndef CAN_NETLINK_H
include/socketcan/can/raw.h
+2 -5
View File
@@ -3,15 +3,11 @@
*
* Definitions for raw CAN sockets
*
* $Id$
*
* Authors: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
* Urs Thuermann <urs.thuermann@volkswagen.de>
* Copyright (c) 2002-2007 Volkswagen Group Electronic Research
* All rights reserved.
*
* Send feedback to <linux-can@vger.kernel.org>
*
*/
#ifndef CAN_RAW_H
@@ -27,7 +23,8 @@ enum {
CAN_RAW_FILTER = 1, /* set 0 .. n can_filter(s) */
CAN_RAW_ERR_FILTER, /* set filter for error frames */
CAN_RAW_LOOPBACK, /* local loopback (default:on) */
CAN_RAW_RECV_OWN_MSGS /* receive my own msgs (default:off) */
CAN_RAW_RECV_OWN_MSGS, /* receive my own msgs (default:off) */
CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */
};
#endif