Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / include / linux / can / core.h

diff --git a/kernel/include/linux/can/core.h b/kernel/include/linux/can/core.h
index a087500..df08a41 100644 (file)
--- a/kernel/include/linux/can/core.h
+++ b/kernel/include/linux/can/core.h
@@ -45,10 +45,9 @@ struct can_proto {
 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);
+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, struct sock *sk);
 
 extern void can_rx_unregister(struct net_device *dev, canid_t can_id,
                              canid_t mask,