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

Commit 4f248cff authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Remove multiple assignment per line 



The Linux CodingStyle disallows multiple assignments in a single line.
(see chapter 1)

Reported-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
parent 34473822

net/batman-adv/bat_iv_ogm.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1004,7 +1004,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
{

{

	struct batadv_neigh_ifinfo *neigh_ifinfo = NULL;

	struct batadv_neigh_ifinfo *neigh_ifinfo = NULL;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;

	struct batadv_neigh_node *neigh_node = NULL;

	struct batadv_neigh_node *tmp_neigh_node = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_orig_node *orig_node_tmp;

	struct batadv_orig_node *orig_node_tmp;

	int if_num;

	int if_num;
@@ -1404,7 +1405,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
				struct batadv_hard_iface *if_outgoing)

				struct batadv_hard_iface *if_outgoing)

{

{

	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batadv_neigh_node *router = NULL, *router_router = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_node *router_router = NULL;

	struct batadv_orig_node *orig_neigh_node;

	struct batadv_orig_node *orig_neigh_node;

	struct batadv_orig_ifinfo *orig_ifinfo;

	struct batadv_orig_ifinfo *orig_ifinfo;

	struct batadv_neigh_node *orig_neigh_router = NULL;

	struct batadv_neigh_node *orig_neigh_router = NULL;

net/batman-adv/bridge_loop_avoidance.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -88,7 +88,8 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, 
{

{

	const void *data1 = container_of(node, struct batadv_bla_backbone_gw,

	const void *data1 = container_of(node, struct batadv_bla_backbone_gw,

					 hash_entry);

					 hash_entry);

	const struct batadv_bla_backbone_gw *gw1 = data1, *gw2 = data2;

	const struct batadv_bla_backbone_gw *gw1 = data1;

	const struct batadv_bla_backbone_gw *gw2 = data2;





	if (!batadv_compare_eth(gw1->orig, gw2->orig))

	if (!batadv_compare_eth(gw1->orig, gw2->orig))

		return 0;

		return 0;
@@ -105,7 +106,8 @@ static int batadv_compare_claim(const struct hlist_node *node, 
{

{

	const void *data1 = container_of(node, struct batadv_bla_claim,

	const void *data1 = container_of(node, struct batadv_bla_claim,

					 hash_entry);

					 hash_entry);

	const struct batadv_bla_claim *cl1 = data1, *cl2 = data2;

	const struct batadv_bla_claim *cl1 = data1;

	const struct batadv_bla_claim *cl2 = data2;





	if (!batadv_compare_eth(cl1->addr, cl2->addr))

	if (!batadv_compare_eth(cl1->addr, cl2->addr))

		return 0;

		return 0;

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -497,7 +497,8 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, 
					 int select, batadv_dat_addr_t ip_key,

					 int select, batadv_dat_addr_t ip_key,

					 batadv_dat_addr_t *last_max)

					 batadv_dat_addr_t *last_max)

{

{

	batadv_dat_addr_t max = 0, tmp_max = 0;

	batadv_dat_addr_t max = 0;

	batadv_dat_addr_t tmp_max = 0;

	struct batadv_orig_node *orig_node, *max_orig_node = NULL;

	struct batadv_orig_node *orig_node, *max_orig_node = NULL;

	struct batadv_hashtable *hash = bat_priv->orig_hash;

	struct batadv_hashtable *hash = bat_priv->orig_hash;

	struct hlist_head *head;

	struct hlist_head *head;

net/batman-adv/gateway_client.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -153,7 +153,8 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
	struct batadv_neigh_node *router;

	struct batadv_neigh_node *router;

	struct batadv_neigh_ifinfo *router_ifinfo;

	struct batadv_neigh_ifinfo *router_ifinfo;

	struct batadv_gw_node *gw_node, *curr_gw = NULL;

	struct batadv_gw_node *gw_node, *curr_gw = NULL;

	u64 max_gw_factor = 0, tmp_gw_factor = 0;

	u64 max_gw_factor = 0;

	u64 tmp_gw_factor = 0;

	u8 max_tq = 0;

	u8 max_tq = 0;

	u8 tq_avg;

	u8 tq_avg;

	struct batadv_orig_node *orig_node;

	struct batadv_orig_node *orig_node;
@@ -263,7 +264,8 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv) 




void batadv_gw_election(struct batadv_priv *bat_priv)

void batadv_gw_election(struct batadv_priv *bat_priv)

{

{

	struct batadv_gw_node *curr_gw = NULL, *next_gw = NULL;

	struct batadv_gw_node *curr_gw = NULL;

	struct batadv_gw_node *next_gw = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	char gw_addr[18] = { '\0' };

	char gw_addr[18] = { '\0' };
@@ -347,7 +349,8 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, 
	struct batadv_neigh_ifinfo *router_orig_tq = NULL;

	struct batadv_neigh_ifinfo *router_orig_tq = NULL;

	struct batadv_neigh_ifinfo *router_gw_tq = NULL;

	struct batadv_neigh_ifinfo *router_gw_tq = NULL;

	struct batadv_orig_node *curr_gw_orig;

	struct batadv_orig_node *curr_gw_orig;

	struct batadv_neigh_node *router_gw = NULL, *router_orig = NULL;

	struct batadv_neigh_node *router_gw = NULL;

	struct batadv_neigh_node *router_orig = NULL;

	u8 gw_tq_avg, orig_tq_avg;

	u8 gw_tq_avg, orig_tq_avg;





	curr_gw_orig = batadv_gw_get_selected_orig(bat_priv);

	curr_gw_orig = batadv_gw_get_selected_orig(bat_priv);
@@ -808,9 +811,11 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, 
bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,

bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,

			    struct sk_buff *skb)

			    struct sk_buff *skb)

{

{

	struct batadv_neigh_node *neigh_curr = NULL, *neigh_old = NULL;

	struct batadv_neigh_node *neigh_curr = NULL;

	struct batadv_neigh_node *neigh_old = NULL;

	struct batadv_orig_node *orig_dst_node = NULL;

	struct batadv_orig_node *orig_dst_node = NULL;

	struct batadv_gw_node *gw_node = NULL, *curr_gw = NULL;

	struct batadv_gw_node *gw_node = NULL;

	struct batadv_gw_node *curr_gw = NULL;

	struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;

	struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;

	struct ethhdr *ethhdr = (struct ethhdr *)skb->data;

	struct ethhdr *ethhdr = (struct ethhdr *)skb->data;

	bool out_of_range = false;

	bool out_of_range = false;

net/batman-adv/gateway_common.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,10 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, 
				size_t count)

				size_t count)

{

{

	struct batadv_priv *bat_priv = netdev_priv(net_dev);

	struct batadv_priv *bat_priv = netdev_priv(net_dev);

	u32 down_curr, up_curr, down_new = 0, up_new = 0;

	u32 down_curr;

	u32 up_curr;

	u32 down_new = 0;

	u32 up_new = 0;

	bool ret;

	bool ret;





	down_curr = (unsigned int)atomic_read(&bat_priv->gw.bandwidth_down);

	down_curr = (unsigned int)atomic_read(&bat_priv->gw.bandwidth_down);