diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:07 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:07 +0800 |
| commit | 80c4b9b705e8a39b771f1a10d124224aecd963f0 (patch) | |
| tree | 37854ad6e98c9559023a9465b6e33d0aade0d9c8 /include | |
| parent | 371f523934b429b86aba077ebe6a274dcad6f6ff (diff) | |
| parent | c22be946053870ba15be4652c0e828a4969c8a6f (diff) | |
Merge branch 'can/next' into next
* can/next: (29 commits)
can: flexcan: Add S32V234 support to FlexCAN driver
can: flexcan: add CAN wakeup function for i.MX8
can: flexcan: change the way of stop mode acknowledgment
can: flexcan: fix deadlock when using self wakeup
can: flexcan: add LPSR mode support for i.MX7D
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/rx-offload.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/can/rx-offload.h b/include/linux/can/rx-offload.h index 01219f2902bf..1b78a0cfb615 100644 --- a/include/linux/can/rx-offload.h +++ b/include/linux/can/rx-offload.h @@ -15,9 +15,9 @@ struct can_rx_offload { struct net_device *dev; - unsigned int (*mailbox_read)(struct can_rx_offload *offload, - struct can_frame *cf, - u32 *timestamp, unsigned int mb); + struct sk_buff *(*mailbox_read)(struct can_rx_offload *offload, + unsigned int mb, u32 *timestamp, + bool drop); struct sk_buff_head skb_queue; u32 skb_queue_len_max; @@ -44,7 +44,6 @@ unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, unsigned int idx, u32 timestamp); int can_rx_offload_queue_tail(struct can_rx_offload *offload, struct sk_buff *skb); -void can_rx_offload_reset(struct can_rx_offload *offload); void can_rx_offload_del(struct can_rx_offload *offload); void can_rx_offload_enable(struct can_rx_offload *offload); |