diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2017-10-18 17:40:18 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2017-10-18 17:40:18 +0200 |
| commit | 396665e8320987ff43b20a62a6a1cdae57aa1cc1 (patch) | |
| tree | bf778eab1ef1c9ff102bb235d9bca1a42bec7d0a /net/can/af_can.h | |
| parent | ieee802154: netlink: fix typo of the name of struct genl_ops (diff) | |
| parent | tcp: fix tcp_xmit_retransmit_queue() after rbtree introduction (diff) | |
| download | linux-396665e8320987ff43b20a62a6a1cdae57aa1cc1.tar.xz linux-396665e8320987ff43b20a62a6a1cdae57aa1cc1.zip | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'net/can/af_can.h')
| -rw-r--r-- | net/can/af_can.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/af_can.h b/net/can/af_can.h index d0ef45bb2a72..eca6463c6213 100644 --- a/net/can/af_can.h +++ b/net/can/af_can.h @@ -113,6 +113,6 @@ struct s_pstats { /* function prototypes for the CAN networklayer procfs (proc.c) */ void can_init_proc(struct net *net); void can_remove_proc(struct net *net); -void can_stat_update(unsigned long data); +void can_stat_update(struct timer_list *t); #endif /* AF_CAN_H */ |