diff options
author | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 12:24:00 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 17:20:05 -0500 |
commit | 60709c093ed39aadb0f09972ebbc96dc34eb372e (patch) | |
tree | 983681311986070971d3756d9f8e75868aa7bb9a /include/linux/can/core.h | |
parent | 7323f0d2881bbd426ce6bc0a956ef9e739ffe767 (diff) | |
parent | 0839ffb83e44e5ff1843e932592525fc2bff23ff (diff) | |
download | linux-60709c093ed39aadb0f09972ebbc96dc34eb372e.tar.gz linux-60709c093ed39aadb0f09972ebbc96dc34eb372e.tar.xz |
nfsd: merge stable fix into main nfsd branch
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, |