summaryrefslogtreecommitdiffstats
path: root/include/linux/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-13 18:16:00 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-13 18:16:00 -0500
commit886ab57c848892ebdddabca9990415176cf90679 (patch)
treeb2db893ef0aecacd26ffd9d1d69a4099a1b8885b /include/linux/can
parent3410f22ea9693ed66e15a0764f20388bf39dd93d (diff)
parent17a50ee4bd47bdba94546e0526fc9ce93dc77d5e (diff)
Merge tag 'linux-can-next-for-3.15-20140212' of git://gitorious.org/linux-can/linux-can-next
linux-can-next-for-3.15-20140212 Marc Kleine-Budde says: ==================== this is a pull request of eight patches for net-next/master. Florian Vaussard contributed a series that merged the sja1000 of_platform into the platform driver. The of_platform driver is finally removed. Stephane Grosjean supplied a patch to allocate CANFD skbs. In a patch by Uwe Kleine-König another missing copyright information was added to a userspace header. And a patch by Yoann DI RUZZA that adds listen only mode to the at91_can driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/can')
-rw-r--r--include/linux/can/dev.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index fb0ab651a04..dc5f9026b67 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -124,6 +124,8 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx);
void can_free_echo_skb(struct net_device *dev, unsigned int idx);
struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
+struct sk_buff *alloc_canfd_skb(struct net_device *dev,
+ struct canfd_frame **cfd);
struct sk_buff *alloc_can_err_skb(struct net_device *dev,
struct can_frame **cf);