diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2011-03-22 08:27:25 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-27 23:34:59 -0700 |
commit | 53914b67993c724cec585863755c9ebc8446e83b (patch) | |
tree | 851d031dd41a74c7e03436ca7c98455fee1c598e /include/linux/can | |
parent | 3b261ade4224852ed841ecfd13876db812846e96 (diff) | |
download | linux-stable-53914b67993c724cec585863755c9ebc8446e83b.tar.gz linux-stable-53914b67993c724cec585863755c9ebc8446e83b.tar.bz2 linux-stable-53914b67993c724cec585863755c9ebc8446e83b.zip |
can: make struct proto const
can_ioctl is the only reason for struct proto to be non-const.
script/check-patch.pl suggests struct proto be const.
Setting the reference to the common can_ioctl() in all CAN protocols directly
removes the need to make the struct proto writable in af_can.c
Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/can')
-rw-r--r-- | include/linux/can/core.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index 6c507bea275f..6f70a6d3a16e 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h @@ -36,10 +36,10 @@ * @prot: pointer to struct proto structure. */ struct can_proto { - int type; - int protocol; - struct proto_ops *ops; - struct proto *prot; + int type; + int protocol; + const struct proto_ops *ops; + struct proto *prot; }; /* function prototypes for the CAN networklayer core (af_can.c) */ @@ -58,5 +58,6 @@ extern void can_rx_unregister(struct net_device *dev, canid_t can_id, 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 */ |