Commit 86a5ad0a authored by Yufeng Mo's avatar Yufeng Mo Committed by David S. Miller

net: bonding: add some required blank lines

Add some blank lines after declarations as required.
Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 92b13cab
...@@ -104,6 +104,7 @@ static void __tlb_clear_slave(struct bonding *bond, struct slave *slave, ...@@ -104,6 +104,7 @@ static void __tlb_clear_slave(struct bonding *bond, struct slave *slave,
index = SLAVE_TLB_INFO(slave).head; index = SLAVE_TLB_INFO(slave).head;
while (index != TLB_NULL_INDEX) { while (index != TLB_NULL_INDEX) {
u32 next_index = tx_hash_table[index].next; u32 next_index = tx_hash_table[index].next;
tlb_init_table_entry(&tx_hash_table[index], save_load); tlb_init_table_entry(&tx_hash_table[index], save_load);
index = next_index; index = next_index;
} }
...@@ -628,6 +629,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, ...@@ -628,6 +629,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb,
if (!client_info->assigned) { if (!client_info->assigned) {
u32 prev_tbl_head = bond_info->rx_hashtbl_used_head; u32 prev_tbl_head = bond_info->rx_hashtbl_used_head;
bond_info->rx_hashtbl_used_head = hash_index; bond_info->rx_hashtbl_used_head = hash_index;
client_info->used_next = prev_tbl_head; client_info->used_next = prev_tbl_head;
if (prev_tbl_head != RLB_NULL_INDEX) { if (prev_tbl_head != RLB_NULL_INDEX) {
...@@ -830,6 +832,7 @@ static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp) ...@@ -830,6 +832,7 @@ static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp)
while (index != RLB_NULL_INDEX) { while (index != RLB_NULL_INDEX) {
struct rlb_client_info *entry = &(bond_info->rx_hashtbl[index]); struct rlb_client_info *entry = &(bond_info->rx_hashtbl[index]);
u32 next_index = entry->src_next; u32 next_index = entry->src_next;
if (entry->ip_src == arp->ip_src && if (entry->ip_src == arp->ip_src &&
!ether_addr_equal_64bits(arp->mac_src, entry->mac_src)) !ether_addr_equal_64bits(arp->mac_src, entry->mac_src))
rlb_delete_table_entry(bond, index); rlb_delete_table_entry(bond, index);
......
...@@ -2272,6 +2272,7 @@ static int bond_release_and_destroy(struct net_device *bond_dev, ...@@ -2272,6 +2272,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) static void bond_info_query(struct net_device *bond_dev, struct ifbond *info)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
bond_fill_ifbond(bond, info); bond_fill_ifbond(bond, info);
} }
...@@ -4849,6 +4850,7 @@ static const struct device_type bond_type = { ...@@ -4849,6 +4850,7 @@ static const struct device_type bond_type = {
static void bond_destructor(struct net_device *bond_dev) static void bond_destructor(struct net_device *bond_dev)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
if (bond->wq) if (bond->wq)
destroy_workqueue(bond->wq); destroy_workqueue(bond->wq);
} }
......
...@@ -112,6 +112,7 @@ static void bond_info_show_master(struct seq_file *seq) ...@@ -112,6 +112,7 @@ static void bond_info_show_master(struct seq_file *seq)
/* ARP information */ /* ARP information */
if (bond->params.arp_interval > 0) { if (bond->params.arp_interval > 0) {
int printed = 0; int printed = 0;
seq_printf(seq, "ARP Polling Interval (ms): %d\n", seq_printf(seq, "ARP Polling Interval (ms): %d\n",
bond->params.arp_interval); bond->params.arp_interval);
......
...@@ -385,6 +385,7 @@ static ssize_t bonding_show_num_peer_notif(struct device *d, ...@@ -385,6 +385,7 @@ static ssize_t bonding_show_num_peer_notif(struct device *d,
char *buf) char *buf)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
return sprintf(buf, "%d\n", bond->params.num_peer_notif); return sprintf(buf, "%d\n", bond->params.num_peer_notif);
} }
static DEVICE_ATTR(num_grat_arp, 0644, static DEVICE_ATTR(num_grat_arp, 0644,
...@@ -496,6 +497,7 @@ static ssize_t bonding_show_ad_aggregator(struct device *d, ...@@ -496,6 +497,7 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,
if (BOND_MODE(bond) == BOND_MODE_8023AD) { if (BOND_MODE(bond) == BOND_MODE_8023AD) {
struct ad_info ad_info; struct ad_info ad_info;
count = sprintf(buf, "%d\n", count = sprintf(buf, "%d\n",
bond_3ad_get_active_agg_info(bond, &ad_info) bond_3ad_get_active_agg_info(bond, &ad_info)
? 0 : ad_info.aggregator_id); ? 0 : ad_info.aggregator_id);
...@@ -516,6 +518,7 @@ static ssize_t bonding_show_ad_num_ports(struct device *d, ...@@ -516,6 +518,7 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,
if (BOND_MODE(bond) == BOND_MODE_8023AD) { if (BOND_MODE(bond) == BOND_MODE_8023AD) {
struct ad_info ad_info; struct ad_info ad_info;
count = sprintf(buf, "%d\n", count = sprintf(buf, "%d\n",
bond_3ad_get_active_agg_info(bond, &ad_info) bond_3ad_get_active_agg_info(bond, &ad_info)
? 0 : ad_info.ports); ? 0 : ad_info.ports);
...@@ -536,6 +539,7 @@ static ssize_t bonding_show_ad_actor_key(struct device *d, ...@@ -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)) { if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {
struct ad_info ad_info; struct ad_info ad_info;
count = sprintf(buf, "%d\n", count = sprintf(buf, "%d\n",
bond_3ad_get_active_agg_info(bond, &ad_info) bond_3ad_get_active_agg_info(bond, &ad_info)
? 0 : ad_info.actor_key); ? 0 : ad_info.actor_key);
...@@ -556,6 +560,7 @@ static ssize_t bonding_show_ad_partner_key(struct device *d, ...@@ -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)) { if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {
struct ad_info ad_info; struct ad_info ad_info;
count = sprintf(buf, "%d\n", count = sprintf(buf, "%d\n",
bond_3ad_get_active_agg_info(bond, &ad_info) bond_3ad_get_active_agg_info(bond, &ad_info)
? 0 : ad_info.partner_key); ? 0 : ad_info.partner_key);
...@@ -576,6 +581,7 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d, ...@@ -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)) { if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {
struct ad_info ad_info; struct ad_info ad_info;
if (!bond_3ad_get_active_agg_info(bond, &ad_info)) if (!bond_3ad_get_active_agg_info(bond, &ad_info))
count = sprintf(buf, "%pM\n", ad_info.partner_system); count = sprintf(buf, "%pM\n", ad_info.partner_system);
} }
...@@ -660,6 +666,7 @@ static ssize_t bonding_show_tlb_dynamic_lb(struct device *d, ...@@ -660,6 +666,7 @@ static ssize_t bonding_show_tlb_dynamic_lb(struct device *d,
char *buf) char *buf)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
return sprintf(buf, "%d\n", bond->params.tlb_dynamic_lb); return sprintf(buf, "%d\n", bond->params.tlb_dynamic_lb);
} }
static DEVICE_ATTR(tlb_dynamic_lb, 0644, static DEVICE_ATTR(tlb_dynamic_lb, 0644,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment