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

Commit 31924325 authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

bonding: remove the unnecessary struct bond_net 



Move the structure bond_net forward, and remove the unnecessary structure declaration.

Cc: Jay Vosburgh <j.vosburgh@gmail.com>
Cc: Veaceslav Falico <vfalico@gmail.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32a4be48

drivers/net/bonding/bonding.h

+8 −10
Original line number Diff line number Diff line
@@ -488,7 +488,14 @@ static inline bool slave_can_tx(struct slave *slave) 
		return false;

}



struct bond_net;

struct bond_net {

	struct net		*net;	/* Associated network namespace */

	struct list_head	dev_list;

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry	*proc_dir;

#endif

	struct class_attribute	class_attr_bonding_masters;

};



int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave);

void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);
@@ -517,15 +524,6 @@ struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond); 
struct net_device *bond_option_active_slave_get(struct bonding *bond);

const char *bond_slave_link_status(s8 link);



struct bond_net {

	struct net *		net;	/* Associated network namespace */

	struct list_head	dev_list;

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *	proc_dir;

#endif

	struct class_attribute	class_attr_bonding_masters;

};



#ifdef CONFIG_PROC_FS

void bond_create_proc_entry(struct bonding *bond);

void bond_remove_proc_entry(struct bonding *bond);