Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82047ad7 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Rename batadv_hardif *_free_ref function to *_put 



The batman-adv source code is the only place in the kernel which uses the
*_free_ref naming scheme for the *_put functions. Changing it to *_put
makes it more consistent and makes it easier to understand the connection
to the *_get functions.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 5d967310

net/batman-adv/bat_iv_ogm.c

+5 −5
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) 


out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

}



/**
@@ -617,7 +617,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, 


out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	return res;

}
@@ -711,9 +711,9 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
	if (!own_packet)

		atomic_inc(&bat_priv->batman_queue_left);

out_free_outgoing:

	batadv_hardif_free_ref(if_outgoing);

	batadv_hardif_put(if_outgoing);

out_free_incoming:

	batadv_hardif_free_ref(if_incoming);

	batadv_hardif_put(if_incoming);

}



/* aggregate a new packet into the existing ogm packet */
@@ -958,7 +958,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) 


out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

}



/**

net/batman-adv/bridge_loop_avoidance.c

+9 −9
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, 
	netif_rx(skb);

out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

}



/**
@@ -1282,7 +1282,7 @@ void batadv_bla_status_update(struct net_device *net_dev) 
	 * so just call that one.

	 */

	batadv_bla_update_orig_address(bat_priv, primary_if, primary_if);

	batadv_hardif_free_ref(primary_if);

	batadv_hardif_put(primary_if);

}



/**
@@ -1356,7 +1356,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) 
	}

out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);



	queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,

			   msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
@@ -1395,7 +1395,7 @@ int batadv_bla_init(struct batadv_priv *bat_priv) 
	if (primary_if) {

		crc = crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN);

		bat_priv->bla.claim_dest.group = htons(crc);

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	} else {

		bat_priv->bla.claim_dest.group = 0; /* will be set later */

	}
@@ -1599,7 +1599,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv) 
		bat_priv->bla.backbone_hash = NULL;

	}

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

}



/**
@@ -1692,7 +1692,7 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, 


out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	if (claim)

		batadv_claim_free_ref(claim);

	return ret;
@@ -1781,7 +1781,7 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	ret = 1;

out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	if (claim)

		batadv_claim_free_ref(claim);

	return ret;
@@ -1839,7 +1839,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
	}

out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	return 0;

}
@@ -1904,6 +1904,6 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
	}

out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	return 0;

}

net/batman-adv/distributed-arp-table.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) 


out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	return 0;

}

net/batman-adv/fragmentation.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, 


out_err:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);



	return ret;

}

net/batman-adv/gateway_client.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) 


out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

		batadv_hardif_put(primary_if);

	return 0;

}