diff options
author | dingtianhong <dingtianhong@huawei.com> | 2014-05-07 10:10:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-08 23:41:12 -0400 |
commit | 31924325f59ba94deb255e8ae314eb103141af40 (patch) | |
tree | cab95981213f76a7d052fd68a8441a5376386cac | |
parent | 32a4be48907b930606f8736caa15c812af802227 (diff) |
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: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/bonding/bonding.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index c1c7c2f12ac4..1eab9115517d 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -488,7 +488,14 @@ static inline bool slave_can_tx(struct slave *slave) | |||
488 | return false; | 488 | return false; |
489 | } | 489 | } |
490 | 490 | ||
491 | struct bond_net; | 491 | struct bond_net { |
492 | struct net *net; /* Associated network namespace */ | ||
493 | struct list_head dev_list; | ||
494 | #ifdef CONFIG_PROC_FS | ||
495 | struct proc_dir_entry *proc_dir; | ||
496 | #endif | ||
497 | struct class_attribute class_attr_bonding_masters; | ||
498 | }; | ||
492 | 499 | ||
493 | int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); | 500 | int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); |
494 | void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); | 501 | 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); | |||
517 | struct net_device *bond_option_active_slave_get(struct bonding *bond); | 524 | struct net_device *bond_option_active_slave_get(struct bonding *bond); |
518 | const char *bond_slave_link_status(s8 link); | 525 | const char *bond_slave_link_status(s8 link); |
519 | 526 | ||
520 | struct bond_net { | ||
521 | struct net * net; /* Associated network namespace */ | ||
522 | struct list_head dev_list; | ||
523 | #ifdef CONFIG_PROC_FS | ||
524 | struct proc_dir_entry * proc_dir; | ||
525 | #endif | ||
526 | struct class_attribute class_attr_bonding_masters; | ||
527 | }; | ||
528 | |||
529 | #ifdef CONFIG_PROC_FS | 527 | #ifdef CONFIG_PROC_FS |
530 | void bond_create_proc_entry(struct bonding *bond); | 528 | void bond_create_proc_entry(struct bonding *bond); |
531 | void bond_remove_proc_entry(struct bonding *bond); | 529 | void bond_remove_proc_entry(struct bonding *bond); |