diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:18 +0800 |
| commit | aedb4a24b9ae4fbd6ced45ae64ae3d84b423f5c2 (patch) | |
| tree | 222bb3ce7eb552c8f92bd836bb0b9dcad0020cb3 /include/linux/can/core.h | |
| parent | 332efa4adbb90f2e335a405504fdfa6c1469701e (diff) | |
| parent | f1924ac09c968c94c922b723979d344b8ff106cd (diff) | |
Merge tag 'v4.4.51' into linux-linaro-lsk-v4.4
This is the 4.4.51 stable release
Diffstat (limited to 'include/linux/can/core.h')
| -rw-r--r-- | include/linux/can/core.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index a0875001b13c..df08a41d5be5 100644 --- a/include/linux/can/core.h +++ b/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, |