diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-07 08:49:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-02-07 08:49:17 +0100 |
commit | 87a8d03266a55f18f31fdb71c28a8dcffe39124d (patch) | |
tree | ab337ca060871296a8dc5d47fcd45da9dcb17a3a /include/linux/can/core.h | |
parent | efi/libstub: Preserve .debug sections after absolute relocation check (diff) | |
parent | Linux 4.10-rc7 (diff) | |
download | linux-dev-87a8d03266a55f18f31fdb71c28a8dcffe39124d.tar.xz linux-dev-87a8d03266a55f18f31fdb71c28a8dcffe39124d.zip |
Merge tag 'v4.10-rc7' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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, |