Merge tag 'v3.10.105' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / can / dev.h

diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index fb0ab651a04196ac247b718221cd857de0cc5365..fb9fbe2f63e7e170665c3fe8490af5ce0fdff859 100644 (file)
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -31,6 +31,7 @@ enum can_mode {
  * CAN common private data
  */
 struct can_priv {
+       struct net_device *dev;
        struct can_device_stats can_stats;
 
        struct can_bittiming bittiming;
@@ -42,7 +43,7 @@ struct can_priv {
        u32 ctrlmode_supported;
 
        int restart_ms;
-       struct timer_list restart_timer;
+       struct delayed_work restart_work;
 
        int (*do_set_bittiming)(struct net_device *dev);
        int (*do_set_mode)(struct net_device *dev, enum can_mode mode);