Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee64faf authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bonding: get rid of CONFIG_PROC_FS ifdefs 



Remove CONFIG_PROC_FS ifdefs from the code by adding void functions.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>

 drivers/net/bonding/bond_main.c |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f001fde5

drivers/net/bonding/bond_main.c

+20 −10
Original line number Diff line number Diff line
@@ -3459,8 +3459,28 @@ static void bond_destroy_proc_dir(void) 
		bond_proc_dir = NULL;

	}

}



#else /* !CONFIG_PROC_FS */



static int bond_create_proc_entry(struct bonding *bond)

{

}



static void bond_remove_proc_entry(struct bonding *bond)

{

}



static void bond_create_proc_dir(void)

{

}



static void bond_destroy_proc_dir(void)

{

}



#endif /* CONFIG_PROC_FS */





/*-------------------------- netdev event handling --------------------------*/



/*
@@ -3468,10 +3488,8 @@ static void bond_destroy_proc_dir(void) 
 */

static int bond_event_changename(struct bonding *bond)

{

#ifdef CONFIG_PROC_FS

	bond_remove_proc_entry(bond);

	bond_create_proc_entry(bond);

#endif

	down_write(&(bonding_rwsem));

        bond_destroy_sysfs_entry(bond);

        bond_create_sysfs_entry(bond);
@@ -4637,9 +4655,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params) 
			       NETIF_F_HW_VLAN_RX |

			       NETIF_F_HW_VLAN_FILTER);



#ifdef CONFIG_PROC_FS

	bond_create_proc_entry(bond);

#endif

	list_add_tail(&bond->bond_list, &bond_dev_list);



	return 0;
@@ -4677,9 +4693,7 @@ static void bond_deinit(struct net_device *bond_dev) 


	bond_work_cancel_all(bond);



#ifdef CONFIG_PROC_FS

	bond_remove_proc_entry(bond);

#endif

}



/* Unregister and free all bond devices.
@@ -4698,9 +4712,7 @@ static void bond_free_all(void) 
		bond_destroy(bond);

	}



#ifdef CONFIG_PROC_FS

	bond_destroy_proc_dir();

#endif

}



/*------------------------- Module initialization ---------------------------*/
@@ -5196,9 +5208,7 @@ static int __init bonding_init(void) 
		goto out;

	}



#ifdef CONFIG_PROC_FS

	bond_create_proc_dir();

#endif



	init_rwsem(&bonding_rwsem);