diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-23 07:13:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-23 07:13:55 -0400 |
| commit | f44ace4d06aab8210d29c731f70b657a7524198b (patch) | |
| tree | 1ed4182b585c331e465a2f9d200c2065789e6b50 /include | |
| parent | 3d4357fba82b3cf19ebf0a04d1c9cb086af15d02 (diff) | |
| parent | 9abefcb1aaa58b9d5aa40a8bb12c87d02415e4c8 (diff) | |
| download | linux-0-day-f44ace4d06aab8210d29c731f70b657a7524198b.tar.gz linux-0-day-f44ace4d06aab8210d29c731f70b657a7524198b.tar.xz | |
Merge tag 'linux-can-fixes-for-4.8-20160922' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2016-09-22
this is a pull request of one patch for the upcoming linux-4.8 release.
The patch by Sergei Miroshnichenko fixes a potential deadlock in the generic
CAN device code that cann occour after a bus-off.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -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 5261751f6bd4d..5f5270941ba02 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); |