From mboxrd@z Thu Jan 1 00:00:00 1970 From: Veaceslav Falico Subject: Re: [PATCH net-next 1/3] bonding: remove the unnecessary struct bond_net Date: Wed, 7 May 2014 15:26:42 +0200 Message-ID: <20140507132642.GP6295@redhat.com> References: <1399434319-7300-1-git-send-email-dingtianhong@huawei.com> <1399434319-7300-2-git-send-email-dingtianhong@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Cc: fubar@us.ibm.com, andy@greyhouse.net, davem@davemloft.net, netdev@vger.kernel.org To: Ding Tianhong Return-path: Received: from mx1.redhat.com ([209.132.183.28]:4975 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933093AbaEGN1K (ORCPT ); Wed, 7 May 2014 09:27:10 -0400 Content-Disposition: inline In-Reply-To: <1399434319-7300-2-git-send-email-dingtianhong@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, May 07, 2014 at 11:45:17AM +0800, Ding Tianhong wrote: >Move the structure bond_net forward, and remove the unnecessary structure declaration. > >Cc: Ding Tianhong >Cc: Jay Vosburgh >Cc: Andy Gospodarek >Signed-off-by: Ding Tianhong >--- > drivers/net/bonding/bonding.h | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > >diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h >index b8bdd0a..9f23bf3 100644 >--- a/drivers/net/bonding/bonding.h >+++ b/drivers/net/bonding/bonding.h >@@ -487,7 +487,14 @@ static inline bool slave_can_tx(struct slave *slave) > return false; > } > >-struct bond_net; >+struct bond_net { >+ struct net * net; /* Associated network namespace */ You might as well clean this up to look like "foo *bar;". >+ struct list_head dev_list; >+#ifdef CONFIG_PROC_FS >+ struct proc_dir_entry * proc_dir; Ditto. >+#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); >@@ -516,15 +523,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); >-- >1.8.0 > >