p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

can: only call can_stat_update with procfs 

The change to leave out procfs support in CAN when CONFIG_PROC_FS
is not set was incomplete and leads to a build error:

net/built-in.o: In function `can_init':
:(.init.text+0x9858): undefined reference to `can_stat_update'
ERROR: "can_stat_update" [net/can/can.ko] undefined!

This tries a better approach, encapsulating all of the calls
within IS_ENABLED(), so we also leave out the timer function
from the object file.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: a20fadf853 ("can: build proc support only if CONFIG_PROC_FS is activated")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Arnd Bergmann 2016-06-20 17:51:52 +02:00 committed by Marc Kleine-Budde
parent b95e5928fc
commit 2781ff5c8f
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/can/af_can.c
View File

@ -911,14 +911,14 @@ static __init int can_init(void)
if (!rcv_cache) if (!rcv_cache)
return -ENOMEM; return -ENOMEM;
if (stats_timer) { if (IS_ENABLED(CONFIG_PROC_FS)) {
if (stats_timer) {
/* the statistics are updated every second (timer triggered) */ /* the statistics are updated every second (timer triggered) */
setup_timer(&can_stattimer, can_stat_update, 0); setup_timer(&can_stattimer, can_stat_update, 0);
mod_timer(&can_stattimer, round_jiffies(jiffies + HZ)); mod_timer(&can_stattimer, round_jiffies(jiffies + HZ));
} else }
can_stattimer.function = NULL; can_init_proc();
}
can_init_proc();
/* protocol register */ /* protocol register */
sock_register(&can_family_ops); sock_register(&can_family_ops);
@ -933,10 +933,12 @@ static __exit void can_exit(void)
{ {
struct net_device *dev; struct net_device *dev;
if (stats_timer) if (IS_ENABLED(CONFIG_PROC_FS)) {
del_timer_sync(&can_stattimer); if (stats_timer)
del_timer_sync(&can_stattimer);
can_remove_proc(); can_remove_proc();
}
/* protocol unregister */ /* protocol unregister */
dev_remove_pack(&canfd_packet); dev_remove_pack(&canfd_packet);

11
net/can/af_can.h
View File

@ -113,19 +113,8 @@ struct s_pstats {
extern struct dev_rcv_lists can_rx_alldev_list; extern struct dev_rcv_lists can_rx_alldev_list;
/* function prototypes for the CAN networklayer procfs (proc.c) */ /* function prototypes for the CAN networklayer procfs (proc.c) */
#ifdef CONFIG_PROC_FS
void can_init_proc(void); void can_init_proc(void);
void can_remove_proc(void); void can_remove_proc(void);
#else
static inline void can_init_proc(void)
{
pr_info("can: Can't create /proc/net/can. CONFIG_PROC_FS missing!\n");
}
static inline void can_remove_proc(void)
{
}
#endif
void can_stat_update(unsigned long data); void can_stat_update(unsigned long data);
/* structures and variables from af_can.c needed in proc.c for reading */ /* structures and variables from af_can.c needed in proc.c for reading */