These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / can / dev.h

diff --git a/kernel/include/linux/can/dev.h b/kernel/include/linux/can/dev.h
index c3a9c8f..735f9f8 100644 (file)
--- a/kernel/include/linux/can/dev.h
+++ b/kernel/include/linux/can/dev.h
@@ -14,9 +14,10 @@
 #define _CAN_DEV_H
 
 #include <linux/can.h>
-#include <linux/can/netlink.h>
 #include <linux/can/error.h>
 #include <linux/can/led.h>
+#include <linux/can/netlink.h>
+#include <linux/netdevice.h>
 
 /*
  * CAN mode
@@ -77,7 +78,7 @@ struct can_priv {
 #define get_canfd_dlc(i)       (min_t(__u8, (i), CANFD_MAX_DLC))
 
 /* Drop a given socketbuffer if it does not contain a valid CAN frame. */
-static inline int can_dropped_invalid_skb(struct net_device *dev,
+static inline bool can_dropped_invalid_skb(struct net_device *dev,
                                          struct sk_buff *skb)
 {
        const struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
@@ -93,12 +94,12 @@ static inline int can_dropped_invalid_skb(struct net_device *dev,
        } else
                goto inval_skb;
 
-       return 0;
+       return false;
 
 inval_skb:
        kfree_skb(skb);
        dev->stats.tx_dropped++;
-       return 1;
+       return true;
 }
 
 static inline bool can_is_canfd_skb(const struct sk_buff *skb)