diff options
Diffstat (limited to 'net/can/proc.c')
-rw-r--r-- | net/can/proc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/can/proc.c b/net/can/proc.c index edb822c31902..d05e8c8b420d 100644 --- a/net/can/proc.c +++ b/net/can/proc.c | |||
@@ -78,14 +78,14 @@ static const char rx_list_name[][8] = { | |||
78 | 78 | ||
79 | static void can_init_stats(struct net *net) | 79 | static void can_init_stats(struct net *net) |
80 | { | 80 | { |
81 | struct s_stats *can_stats = net->can.can_stats; | 81 | struct can_pkg_stats *can_stats = net->can.can_stats; |
82 | struct s_pstats *can_pstats = net->can.can_pstats; | 82 | struct can_rcv_lists_stats *can_pstats = net->can.can_pstats; |
83 | /* | 83 | /* |
84 | * This memset function is called from a timer context (when | 84 | * This memset function is called from a timer context (when |
85 | * can_stattimer is active which is the default) OR in a process | 85 | * can_stattimer is active which is the default) OR in a process |
86 | * context (reading the proc_fs when can_stattimer is disabled). | 86 | * context (reading the proc_fs when can_stattimer is disabled). |
87 | */ | 87 | */ |
88 | memset(can_stats, 0, sizeof(struct s_stats)); | 88 | memset(can_stats, 0, sizeof(struct can_pkg_stats)); |
89 | can_stats->jiffies_init = jiffies; | 89 | can_stats->jiffies_init = jiffies; |
90 | 90 | ||
91 | can_pstats->stats_reset++; | 91 | can_pstats->stats_reset++; |
@@ -119,7 +119,7 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif, | |||
119 | void can_stat_update(struct timer_list *t) | 119 | void can_stat_update(struct timer_list *t) |
120 | { | 120 | { |
121 | struct net *net = from_timer(net, t, can.can_stattimer); | 121 | struct net *net = from_timer(net, t, can.can_stattimer); |
122 | struct s_stats *can_stats = net->can.can_stats; | 122 | struct can_pkg_stats *can_stats = net->can.can_stats; |
123 | unsigned long j = jiffies; /* snapshot */ | 123 | unsigned long j = jiffies; /* snapshot */ |
124 | 124 | ||
125 | /* restart counting in timer context on user request */ | 125 | /* restart counting in timer context on user request */ |
@@ -212,8 +212,8 @@ static void can_print_recv_banner(struct seq_file *m) | |||
212 | static int can_stats_proc_show(struct seq_file *m, void *v) | 212 | static int can_stats_proc_show(struct seq_file *m, void *v) |
213 | { | 213 | { |
214 | struct net *net = m->private; | 214 | struct net *net = m->private; |
215 | struct s_stats *can_stats = net->can.can_stats; | 215 | struct can_pkg_stats *can_stats = net->can.can_stats; |
216 | struct s_pstats *can_pstats = net->can.can_pstats; | 216 | struct can_rcv_lists_stats *can_pstats = net->can.can_pstats; |
217 | 217 | ||
218 | seq_putc(m, '\n'); | 218 | seq_putc(m, '\n'); |
219 | seq_printf(m, " %8ld transmitted frames (TXF)\n", can_stats->tx_frames); | 219 | seq_printf(m, " %8ld transmitted frames (TXF)\n", can_stats->tx_frames); |
@@ -274,8 +274,8 @@ static int can_stats_proc_show(struct seq_file *m, void *v) | |||
274 | static int can_reset_stats_proc_show(struct seq_file *m, void *v) | 274 | static int can_reset_stats_proc_show(struct seq_file *m, void *v) |
275 | { | 275 | { |
276 | struct net *net = m->private; | 276 | struct net *net = m->private; |
277 | struct s_pstats *can_pstats = net->can.can_pstats; | 277 | struct can_rcv_lists_stats *can_pstats = net->can.can_pstats; |
278 | struct s_stats *can_stats = net->can.can_stats; | 278 | struct can_pkg_stats *can_stats = net->can.can_stats; |
279 | 279 | ||
280 | user_reset = 1; | 280 | user_reset = 1; |
281 | 281 | ||