batman-adv: remove useless blank lines before and after brackets (46d160ef) · Commits · 戴 / test

net/batman-adv/bat_iv_ogm.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -183,7 +183,6 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
		/* adjust all flags and log packets */
		while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,
		batadv_ogm_packet->tt_num_changes)) {

		/* we might have aggregated direct link packets with an
		* ordinary base packet
		*/
		@@ -261,7 +260,6 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
		*/
		if ((directlink && (batadv_ogm_packet->header.ttl == 1)) \|\|
		(forw_packet->own && (forw_packet->if_incoming != primary_if))) {

		/* FIXME: what about aggregated packets ? */
		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
		"%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n",
		@@ -325,7 +323,6 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
		if (time_before(send_time, forw_packet->send_time) &&
		time_after_eq(aggregation_end_time, forw_packet->send_time) &&
		(aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) {

		/* check aggregation compatibility
		* -> direct link packets are broadcasted on
		* their interface only
		@@ -815,7 +812,6 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
		rcu_read_lock();
		hlist_for_each_entry_rcu(tmp_neigh_node, node,
		&orig_neigh_node->neigh_list, list) {

		if (!batadv_compare_eth(tmp_neigh_node->addr,
		orig_neigh_node->orig))
		continue;
		@@ -949,7 +945,6 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
		rcu_read_lock();
		hlist_for_each_entry_rcu(tmp_neigh_node, node,
		&orig_node->neigh_list, list) {

		is_duplicate \|= batadv_test_bit(tmp_neigh_node->real_bits,
		orig_node->last_real_seqno,
		seqno);
		@@ -1223,7 +1218,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,

		/* is single hop (direct) neighbor */
		if (is_single_hop_neigh) {

		/* mark direct link on incoming interface */
		batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet,
		is_single_hop_neigh,

net/batman-adv/bridge_loop_avoidance.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -235,7 +235,6 @@ batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw)
		spin_lock_bh(list_lock);
		hlist_for_each_entry_safe(claim, node, node_tmp,
		head, hash_entry) {

		if (claim->backbone_gw != backbone_gw)
		continue;

		@@ -338,7 +337,6 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, uint8_t mac,
		"bla_send_claim(): REQUEST of %pM to %pMon vid %d\n",
		ethhdr->h_source, ethhdr->h_dest, vid);
		break;

		}

		if (vid != -1)
		@@ -539,7 +537,6 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv,

		batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid,
		BATADV_CLAIM_TYPE_ANNOUNCE);

		}

		/**
		@@ -598,7 +595,6 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,

		claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
		batadv_backbone_gw_free_ref(claim->backbone_gw);

		}
		/* set (new) backbone gw */
		atomic_inc(&backbone_gw->refcount);

net/batman-adv/debugfs.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,6 @@ static ssize_t batadv_log_read(struct file file, char __user buf,

		buf++;
		i++;

		}

		spin_unlock_bh(&debug_log->lock);

net/batman-adv/originator.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ void batadv_originator_free(struct batadv_priv *bat_priv)
		spin_lock_bh(list_lock);
		hlist_for_each_entry_safe(orig_node, node, node_tmp,
		head, hash_entry) {

		hlist_del_rcu(node);
		batadv_orig_node_free_ref(orig_node);
		}
		@@ -291,7 +290,6 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv,
		/* for all neighbors towards this originator ... */
		hlist_for_each_entry_safe(neigh_node, node, node_tmp,
		&orig_node->neigh_list, list) {

		last_seen = neigh_node->last_seen;
		if_incoming = neigh_node->if_incoming;

		@@ -299,7 +297,6 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv,
		(if_incoming->if_status == BATADV_IF_INACTIVE) \|\|
		(if_incoming->if_status == BATADV_IF_NOT_IN_USE) \|\|
		(if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) {

		if ((if_incoming->if_status == BATADV_IF_INACTIVE) \|\|
		(if_incoming->if_status == BATADV_IF_NOT_IN_USE) \|\|
		(if_incoming->if_status == BATADV_IF_TO_BE_REMOVED))

net/batman-adv/routing.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,

		/* route added */
		} else if ((!curr_router) && (neigh_node)) {

		batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
		"Adding route towards: %pM (via %pM)\n",
		orig_node->orig, neigh_node->addr);
		@@ -172,7 +171,6 @@ void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node,
		*/
		hlist_for_each_entry_rcu(tmp_neigh_node, node,
		&orig_node->neigh_list, list) {

		if (tmp_neigh_node == neigh_node)
		continue;

		@@ -836,7 +834,6 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
		if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG &&
		batadv_frag_can_reassemble(skb,
		neigh_node->if_incoming->net_dev->mtu)) {

		ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);

		if (ret == NET_RX_DROP)
		@@ -1103,7 +1100,6 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,

		/* packet for me */
		if (batadv_is_my_mac(unicast_packet->dest)) {

		ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);

		if (ret == NET_RX_DROP)

Admin message