Commit ba102914 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bond-cleanups' 



Guangbin Huang says:

====================
net: bonding: clean up some code style issues

This patchset cleans up some code style issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92b13cab 97a1111d

drivers/net/bonding/bond_alb.c

+4 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static void __tlb_clear_slave(struct bonding *bond, struct slave *slave, 
		index = SLAVE_TLB_INFO(slave).head;

		while (index != TLB_NULL_INDEX) {

			u32 next_index = tx_hash_table[index].next;



			tlb_init_table_entry(&tx_hash_table[index], save_load);

			index = next_index;

		}
@@ -628,6 +629,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, 


		if (!client_info->assigned) {

			u32 prev_tbl_head = bond_info->rx_hashtbl_used_head;



			bond_info->rx_hashtbl_used_head = hash_index;

			client_info->used_next = prev_tbl_head;

			if (prev_tbl_head != RLB_NULL_INDEX) {
@@ -830,6 +832,7 @@ static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp) 
	while (index != RLB_NULL_INDEX) {

		struct rlb_client_info *entry = &(bond_info->rx_hashtbl[index]);

		u32 next_index = entry->src_next;



		if (entry->ip_src == arp->ip_src &&

		    !ether_addr_equal_64bits(arp->mac_src, entry->mac_src))

			rlb_delete_table_entry(bond, index);

drivers/net/bonding/bond_debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -88,10 +88,9 @@ void bond_create_debugfs(void) 
{

	bonding_debug_root = debugfs_create_dir("bonding", NULL);



	if (!bonding_debug_root) {

	if (!bonding_debug_root)

		pr_warn("Warning: Cannot create bonding directory in debugfs\n");

}

}



void bond_destroy_debugfs(void)

{

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1013,11 +1013,10 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) 
			if (bond_is_lb(bond))

				bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);

		} else {

			if (bond_uses_primary(bond)) {

			if (bond_uses_primary(bond))

				slave_info(bond->dev, new_active->dev, "making interface the new active one\n");

		}

	}

	}



	if (bond_uses_primary(bond))

		bond_hw_addr_swap(bond, new_active, old_active);
@@ -2272,6 +2271,7 @@ static int bond_release_and_destroy(struct net_device *bond_dev, 
static void bond_info_query(struct net_device *bond_dev, struct ifbond *info)

{

	struct bonding *bond = netdev_priv(bond_dev);



	bond_fill_ifbond(bond, info);

}
@@ -4849,6 +4849,7 @@ static const struct device_type bond_type = { 
static void bond_destructor(struct net_device *bond_dev)

{

	struct bonding *bond = netdev_priv(bond_dev);



	if (bond->wq)

		destroy_workqueue(bond->wq);

}

drivers/net/bonding/bond_procfs.c

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static void bond_info_show_master(struct seq_file *seq) 
	/* ARP information */

	if (bond->params.arp_interval > 0) {

		int printed = 0;



		seq_printf(seq, "ARP Polling Interval (ms): %d\n",

				bond->params.arp_interval);

drivers/net/bonding/bond_sysfs.c

+7 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ static ssize_t bonding_show_num_peer_notif(struct device *d, 
					   char *buf)

{

	struct bonding *bond = to_bond(d);



	return sprintf(buf, "%d\n", bond->params.num_peer_notif);

}

static DEVICE_ATTR(num_grat_arp, 0644,
@@ -496,6 +497,7 @@ static ssize_t bonding_show_ad_aggregator(struct device *d, 


	if (BOND_MODE(bond) == BOND_MODE_8023AD) {

		struct ad_info ad_info;



		count = sprintf(buf, "%d\n",

				bond_3ad_get_active_agg_info(bond, &ad_info)

				?  0 : ad_info.aggregator_id);
@@ -516,6 +518,7 @@ static ssize_t bonding_show_ad_num_ports(struct device *d, 


	if (BOND_MODE(bond) == BOND_MODE_8023AD) {

		struct ad_info ad_info;



		count = sprintf(buf, "%d\n",

				bond_3ad_get_active_agg_info(bond, &ad_info)

				?  0 : ad_info.ports);
@@ -536,6 +539,7 @@ static ssize_t bonding_show_ad_actor_key(struct device *d, 


	if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {

		struct ad_info ad_info;



		count = sprintf(buf, "%d\n",

				bond_3ad_get_active_agg_info(bond, &ad_info)

				?  0 : ad_info.actor_key);
@@ -556,6 +560,7 @@ static ssize_t bonding_show_ad_partner_key(struct device *d, 


	if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {

		struct ad_info ad_info;



		count = sprintf(buf, "%d\n",

				bond_3ad_get_active_agg_info(bond, &ad_info)

				?  0 : ad_info.partner_key);
@@ -576,6 +581,7 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d, 


	if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {

		struct ad_info ad_info;



		if (!bond_3ad_get_active_agg_info(bond, &ad_info))

			count = sprintf(buf, "%pM\n", ad_info.partner_system);

	}
@@ -660,6 +666,7 @@ static ssize_t bonding_show_tlb_dynamic_lb(struct device *d, 
					   char *buf)

{

	struct bonding *bond = to_bond(d);



	return sprintf(buf, "%d\n", bond->params.tlb_dynamic_lb);

}

static DEVICE_ATTR(tlb_dynamic_lb, 0644,

drivers/net/bonding/bond_netlink.c

+1 −1

File changed.

Contains only whitespace changes.