diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-01 12:17:57 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-01 12:17:57 +0300 |
| commit | 9902aa4728fe9128ea45f1a772e2238d64d8cdc5 (patch) | |
| tree | cca30efb3ad2126fcb10aa6349ed799a5656e851 /include/linux/can | |
| parent | df0bd1e8f3c508bf4c3445f94b12e38289b65f13 (diff) | |
| parent | 90731c24d2db7ec04df43ddbcee9605183d05187 (diff) | |
| download | linux-9902aa4728fe9128ea45f1a772e2238d64d8cdc5.tar.xz | |
Merge branch 'drm-tda998x-mali' into drm-tda998x-devel
Diffstat (limited to 'include/linux/can')
| -rw-r--r-- | include/linux/can/dev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 5261751f6bd4..5f5270941ba0 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -32,6 +32,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, data_bittiming; @@ -47,7 +48,7 @@ struct can_priv { u32 ctrlmode_static; /* static enabled options for driver/hardware */ int restart_ms; - struct timer_list restart_timer; + struct delayed_work restart_work; int (*do_set_bittiming)(struct net_device *dev); int (*do_set_data_bittiming)(struct net_device *dev); |