mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
![Oliver Hartkopp](/assets/img/avatar_default.png)
Armin pointed me to the fact that the identifier which is used to ensure the unique include processing in lunux/include/uapi/linux/can.h is CAN_H. This clashed with his own source as includes from libraries and APIs should use an underscore '_' at the identifier start. This patch fixes the protection identifiers in all CAN relavant includes. Reported-by: Armin Burchardt <armin@uni-bremen.de> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
61 lines
1.7 KiB
C
61 lines
1.7 KiB
C
/*
|
|
* linux/can/core.h
|
|
*
|
|
* Protoypes and definitions for CAN protocol modules using the PF_CAN core
|
|
*
|
|
* Authors: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
|
|
* Urs Thuermann <urs.thuermann@volkswagen.de>
|
|
* Copyright (c) 2002-2007 Volkswagen Group Electronic Research
|
|
* All rights reserved.
|
|
*
|
|
*/
|
|
|
|
#ifndef _CAN_CORE_H
|
|
#define _CAN_CORE_H
|
|
|
|
#include <linux/can.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/netdevice.h>
|
|
|
|
#define CAN_VERSION "20120528"
|
|
|
|
/* increment this number each time you change some user-space interface */
|
|
#define CAN_ABI_VERSION "9"
|
|
|
|
#define CAN_VERSION_STRING "rev " CAN_VERSION " abi " CAN_ABI_VERSION
|
|
|
|
#define DNAME(dev) ((dev) ? (dev)->name : "any")
|
|
|
|
/**
|
|
* struct can_proto - CAN protocol structure
|
|
* @type: type argument in socket() syscall, e.g. SOCK_DGRAM.
|
|
* @protocol: protocol number in socket() syscall.
|
|
* @ops: pointer to struct proto_ops for sock->ops.
|
|
* @prot: pointer to struct proto structure.
|
|
*/
|
|
struct can_proto {
|
|
int type;
|
|
int protocol;
|
|
const struct proto_ops *ops;
|
|
struct proto *prot;
|
|
};
|
|
|
|
/* function prototypes for the CAN networklayer core (af_can.c) */
|
|
|
|
extern int can_proto_register(const struct can_proto *cp);
|
|
extern void can_proto_unregister(const struct can_proto *cp);
|
|
|
|
extern int can_rx_register(struct net_device *dev, canid_t can_id,
|
|
canid_t mask,
|
|
void (*func)(struct sk_buff *, void *),
|
|
void *data, char *ident);
|
|
|
|
extern void can_rx_unregister(struct net_device *dev, canid_t can_id,
|
|
canid_t mask,
|
|
void (*func)(struct sk_buff *, void *),
|
|
void *data);
|
|
|
|
extern int can_send(struct sk_buff *skb, int loop);
|
|
extern int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
|
|
|
|
#endif /* !_CAN_CORE_H */
|