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

linux-can-next-for-4.12-20170427 

-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEE4bay/IylYqM/npjQHv7KIOw4HPYFAlkBofATHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRAe/sog7Dgc9qY7CACnNQLrwm8fIV72DD9+pZ1QsNwvLHCr
 8ZiHSd7m/VI/FESje4Uc3D9vKi7K6MGX9/lWi70QY+2IPrTfRTrYEO5I4U3+1czc
 zQ/NnQGsKBoAJdPLoXp0LkQVAXRSXUoKiaiU0VdktaAzGewixz9YxGHAcCqcu6oM
 1+MftSR0iCP4mkcOyVMcnipcI9L8TzEOz2f3XB/RtMiRGcEsUekAHfdpH6NSHbAq
 mG5pOwENqNn4i1ZwGg16u3p+U4YfWAF9Y+/wuev6Ob4Kla2tYnuZNEAqf9ZubY93
 NBsT3pGjcbzbbihlKvu64NUlGiloQ8AGAYvttinrfx1tnsDgvP2m6nQP
 =mHEY
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-next-for-4.12-20170427' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2017-04-25

this is a pull request of 1 patch for net-next/master.

This patch by Oliver Hartkopp fixes the build of the broad cast manager
with CONFIG_PROC_FS disabled.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-04-30 22:25:59 -04:00
parent 5d4e344328 c2701b370e
commit 4750c7be5b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/can/bcm.c
View File

@ -147,6 +147,7 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)
/* /*
* procfs functions * procfs functions
*/ */
#if IS_ENABLED(CONFIG_PROC_FS)
static char *bcm_proc_getifname(struct net *net, char *result, int ifindex) static char *bcm_proc_getifname(struct net *net, char *result, int ifindex)
{ {
struct net_device *dev; struct net_device *dev;
@ -251,6 +252,7 @@ static const struct file_operations bcm_proc_fops = {
.llseek = seq_lseek, .llseek = seq_lseek,
.release = single_release, .release = single_release,
}; };
#endif /* CONFIG_PROC_FS */
/* /*
* bcm_can_tx - send the (next) CAN frame to the appropriate CAN interface * bcm_can_tx - send the (next) CAN frame to the appropriate CAN interface
@ -1537,9 +1539,11 @@ static int bcm_release(struct socket *sock)
bcm_remove_op(op); bcm_remove_op(op);
} }
#if IS_ENABLED(CONFIG_PROC_FS)
/* remove procfs entry */ /* remove procfs entry */
if (net->can.bcmproc_dir && bo->bcm_proc_read) if (net->can.bcmproc_dir && bo->bcm_proc_read)
remove_proc_entry(bo->procname, net->can.bcmproc_dir); remove_proc_entry(bo->procname, net->can.bcmproc_dir);
#endif /* CONFIG_PROC_FS */
/* remove device reference */ /* remove device reference */
if (bo->bound) { if (bo->bound) {
@ -1598,6 +1602,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
bo->ifindex = 0; bo->ifindex = 0;
} }
#if IS_ENABLED(CONFIG_PROC_FS)
if (net->can.bcmproc_dir) { if (net->can.bcmproc_dir) {
/* unique socket address as filename */ /* unique socket address as filename */
sprintf(bo->procname, "%lu", sock_i_ino(sk)); sprintf(bo->procname, "%lu", sock_i_ino(sk));
@ -1609,6 +1614,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
goto fail; goto fail;
} }
} }
#endif /* CONFIG_PROC_FS */
bo->bound = 1; bo->bound = 1;
@ -1691,22 +1697,21 @@ static const struct can_proto bcm_can_proto = {
static int canbcm_pernet_init(struct net *net) static int canbcm_pernet_init(struct net *net)
{ {
#if IS_ENABLED(CONFIG_PROC_FS)
/* create /proc/net/can-bcm directory */ /* create /proc/net/can-bcm directory */
if (IS_ENABLED(CONFIG_PROC_FS)) { net->can.bcmproc_dir = proc_net_mkdir(net, "can-bcm", net->proc_net);
net->can.bcmproc_dir = #endif /* CONFIG_PROC_FS */
proc_net_mkdir(net, "can-bcm", net->proc_net);
}
return 0; return 0;
} }
static void canbcm_pernet_exit(struct net *net) static void canbcm_pernet_exit(struct net *net)
{ {
#if IS_ENABLED(CONFIG_PROC_FS)
/* remove /proc/net/can-bcm directory */ /* remove /proc/net/can-bcm directory */
if (IS_ENABLED(CONFIG_PROC_FS)) { if (net->can.bcmproc_dir)
if (net->can.bcmproc_dir) remove_proc_entry("can-bcm", net->proc_net);
remove_proc_entry("can-bcm", net->proc_net); #endif /* CONFIG_PROC_FS */
}
} }
static struct pernet_operations canbcm_pernet_ops __read_mostly = { static struct pernet_operations canbcm_pernet_ops __read_mostly = {