Commit dda0fd5c authored by Wang Yufen's avatar Wang Yufen Committed by David S. Miller
Browse files

bonding:fix checkpatch warnings braces {} 



Signed-off-by: default avatarWang Yufen <wangyufen@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35d75ee4

drivers/net/bonding/bond_alb.c

+7 −13
Original line number Diff line number Diff line
@@ -1343,10 +1343,9 @@ void bond_alb_deinitialize(struct bonding *bond) 


	tlb_deinitialize(bond);



	if (bond_info->rlb_enabled) {

	if (bond_info->rlb_enabled)

		rlb_deinitialize(bond);

}

}



int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)

{
@@ -1429,9 +1428,8 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
		break;

	case ETH_P_ARP:

		do_tx_balance = 0;

		if (bond_info->rlb_enabled) {

		if (bond_info->rlb_enabled)

			tx_slave = rlb_arp_xmit(skb, bond);

		}

		break;

	default:

		do_tx_balance = 0;
@@ -1565,14 +1563,13 @@ void bond_alb_monitor(struct work_struct *work) 
				--bond_info->rlb_update_delay_counter;

			} else {

				rlb_update_rx_clients(bond);

				if (bond_info->rlb_update_retry_counter) {

				if (bond_info->rlb_update_retry_counter)

					--bond_info->rlb_update_retry_counter;

				} else {

				else

					bond_info->rx_ntt = 0;

			}

		}

	}

	}

	rcu_read_unlock();

re_arm:

	queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);
@@ -1586,23 +1583,20 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave) 
	int res;



	res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr);

	if (res) {

	if (res)

		return res;

	}



	res = alb_handle_addr_collision_on_attach(bond, slave);

	if (res) {

	if (res)

		return res;

	}



	tlb_init_slave(slave);



	/* order a rebalance ASAP */

	bond->alb_info.tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS;



	if (bond->alb_info.rlb_enabled) {

	if (bond->alb_info.rlb_enabled)

		bond->alb_info.rlb_rebalance = 1;

	}



	return 0;

}