diff options
-rw-r--r-- | include/linux/can/core.h | 4 | ||||
-rw-r--r-- | net/can/af_can.c | 12 | ||||
-rw-r--r-- | net/can/bcm.c | 2 | ||||
-rw-r--r-- | net/can/raw.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index 6f70a6d3a16e..5ce6b5d62ecc 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h | |||
@@ -44,8 +44,8 @@ struct can_proto { | |||
44 | 44 | ||
45 | /* function prototypes for the CAN networklayer core (af_can.c) */ | 45 | /* function prototypes for the CAN networklayer core (af_can.c) */ |
46 | 46 | ||
47 | extern int can_proto_register(struct can_proto *cp); | 47 | extern int can_proto_register(const struct can_proto *cp); |
48 | extern void can_proto_unregister(struct can_proto *cp); | 48 | extern void can_proto_unregister(const struct can_proto *cp); |
49 | 49 | ||
50 | extern int can_rx_register(struct net_device *dev, canid_t can_id, | 50 | extern int can_rx_register(struct net_device *dev, canid_t can_id, |
51 | canid_t mask, | 51 | canid_t mask, |
diff --git a/net/can/af_can.c b/net/can/af_can.c index a8dcaa49675a..5b52762b9f20 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
@@ -84,7 +84,7 @@ static DEFINE_SPINLOCK(can_rcvlists_lock); | |||
84 | static struct kmem_cache *rcv_cache __read_mostly; | 84 | static struct kmem_cache *rcv_cache __read_mostly; |
85 | 85 | ||
86 | /* table of registered CAN protocols */ | 86 | /* table of registered CAN protocols */ |
87 | static struct can_proto *proto_tab[CAN_NPROTO] __read_mostly; | 87 | static const struct can_proto *proto_tab[CAN_NPROTO] __read_mostly; |
88 | static DEFINE_MUTEX(proto_tab_lock); | 88 | static DEFINE_MUTEX(proto_tab_lock); |
89 | 89 | ||
90 | struct timer_list can_stattimer; /* timer for statistics update */ | 90 | struct timer_list can_stattimer; /* timer for statistics update */ |
@@ -115,9 +115,9 @@ static void can_sock_destruct(struct sock *sk) | |||
115 | skb_queue_purge(&sk->sk_receive_queue); | 115 | skb_queue_purge(&sk->sk_receive_queue); |
116 | } | 116 | } |
117 | 117 | ||
118 | static struct can_proto *can_try_module_get(int protocol) | 118 | static const struct can_proto *can_try_module_get(int protocol) |
119 | { | 119 | { |
120 | struct can_proto *cp; | 120 | const struct can_proto *cp; |
121 | 121 | ||
122 | rcu_read_lock(); | 122 | rcu_read_lock(); |
123 | cp = rcu_dereference(proto_tab[protocol]); | 123 | cp = rcu_dereference(proto_tab[protocol]); |
@@ -132,7 +132,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol, | |||
132 | int kern) | 132 | int kern) |
133 | { | 133 | { |
134 | struct sock *sk; | 134 | struct sock *sk; |
135 | struct can_proto *cp; | 135 | const struct can_proto *cp; |
136 | int err = 0; | 136 | int err = 0; |
137 | 137 | ||
138 | sock->state = SS_UNCONNECTED; | 138 | sock->state = SS_UNCONNECTED; |
@@ -691,7 +691,7 @@ drop: | |||
691 | * -EBUSY protocol already in use | 691 | * -EBUSY protocol already in use |
692 | * -ENOBUF if proto_register() fails | 692 | * -ENOBUF if proto_register() fails |
693 | */ | 693 | */ |
694 | int can_proto_register(struct can_proto *cp) | 694 | int can_proto_register(const struct can_proto *cp) |
695 | { | 695 | { |
696 | int proto = cp->protocol; | 696 | int proto = cp->protocol; |
697 | int err = 0; | 697 | int err = 0; |
@@ -728,7 +728,7 @@ EXPORT_SYMBOL(can_proto_register); | |||
728 | * can_proto_unregister - unregister CAN transport protocol | 728 | * can_proto_unregister - unregister CAN transport protocol |
729 | * @cp: pointer to CAN protocol structure | 729 | * @cp: pointer to CAN protocol structure |
730 | */ | 730 | */ |
731 | void can_proto_unregister(struct can_proto *cp) | 731 | void can_proto_unregister(const struct can_proto *cp) |
732 | { | 732 | { |
733 | int proto = cp->protocol; | 733 | int proto = cp->protocol; |
734 | 734 | ||
diff --git a/net/can/bcm.c b/net/can/bcm.c index 8a6a05e7c3c8..cced806098a9 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -1601,7 +1601,7 @@ static struct proto bcm_proto __read_mostly = { | |||
1601 | .init = bcm_init, | 1601 | .init = bcm_init, |
1602 | }; | 1602 | }; |
1603 | 1603 | ||
1604 | static struct can_proto bcm_can_proto __read_mostly = { | 1604 | static const struct can_proto bcm_can_proto = { |
1605 | .type = SOCK_DGRAM, | 1605 | .type = SOCK_DGRAM, |
1606 | .protocol = CAN_BCM, | 1606 | .protocol = CAN_BCM, |
1607 | .ops = &bcm_ops, | 1607 | .ops = &bcm_ops, |
diff --git a/net/can/raw.c b/net/can/raw.c index 0eb39a7fdf64..dea99a6e596c 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
@@ -774,7 +774,7 @@ static struct proto raw_proto __read_mostly = { | |||
774 | .init = raw_init, | 774 | .init = raw_init, |
775 | }; | 775 | }; |
776 | 776 | ||
777 | static struct can_proto raw_can_proto __read_mostly = { | 777 | static const struct can_proto raw_can_proto = { |
778 | .type = SOCK_RAW, | 778 | .type = SOCK_RAW, |
779 | .protocol = CAN_RAW, | 779 | .protocol = CAN_RAW, |
780 | .ops = &raw_ops, | 780 | .ops = &raw_ops, |