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

Commit 35bd69d4 authored by Marek Lindner's avatar Marek Lindner Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: remove redundant pointer to originator interface 



Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1d59f82c

drivers/staging/batman-adv/device.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ ssize_t bat_device_write(struct file *file, const char __user *buff, 
	if (!orig_node->router)

		goto unlock;



	batman_if = orig_node->batman_if;

	batman_if = orig_node->router->if_incoming;

	memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);



	spin_unlock_irqrestore(&orig_hash_lock, flags);

drivers/staging/batman-adv/originator.c

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct orig_node *get_orig_node(uint8_t *addr) 


	memcpy(orig_node->orig, addr, ETH_ALEN);

	orig_node->router = NULL;

	orig_node->batman_if = NULL;

	orig_node->hna_buff = NULL;



	size = num_ifs * sizeof(TYPE_OF_WORD) * NUM_WORDS;

drivers/staging/batman-adv/routing.c

+4 −13
Original line number Diff line number Diff line
@@ -97,11 +97,6 @@ static void update_route(struct orig_node *orig_node, 
		bat_dbg(DBG_ROUTES, "Changing route towards: %pM (now via %pM - was via %pM)\n", orig_node->orig, neigh_node->addr, orig_node->router->addr);

	}



	if (neigh_node != NULL)

		orig_node->batman_if = neigh_node->if_incoming;

	else

		orig_node->batman_if = NULL;



	orig_node->router = neigh_node;

}
@@ -616,12 +611,11 @@ static int recv_my_icmp_packet(struct sk_buff *skb) 
	ret = NET_RX_DROP;



	if ((orig_node != NULL) &&

	    (orig_node->batman_if != NULL) &&

	    (orig_node->router != NULL)) {



		/* don't lock while sending the packets ... we therefore

		 * copy the required data before sending */

		batman_if = orig_node->batman_if;

		batman_if = orig_node->router->if_incoming;

		memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);

		spin_unlock_irqrestore(&orig_hash_lock, flags);
@@ -678,12 +672,11 @@ static int recv_icmp_ttl_exceeded(struct sk_buff *skb) 
	ret = NET_RX_DROP;



	if ((orig_node != NULL) &&

	    (orig_node->batman_if != NULL) &&

	    (orig_node->router != NULL)) {



		/* don't lock while sending the packets ... we therefore

		 * copy the required data before sending */

		batman_if = orig_node->batman_if;

		batman_if = orig_node->router->if_incoming;

		memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);

		spin_unlock_irqrestore(&orig_hash_lock, flags);
@@ -760,12 +753,11 @@ int recv_icmp_packet(struct sk_buff *skb) 
		     hash_find(orig_hash, icmp_packet->dst));



	if ((orig_node != NULL) &&

	    (orig_node->batman_if != NULL) &&

	    (orig_node->router != NULL)) {



		/* don't lock while sending the packets ... we therefore

		 * copy the required data before sending */

		batman_if = orig_node->batman_if;

		batman_if = orig_node->router->if_incoming;

		memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);

		spin_unlock_irqrestore(&orig_hash_lock, flags);
@@ -844,12 +836,11 @@ int recv_unicast_packet(struct sk_buff *skb) 
		     hash_find(orig_hash, unicast_packet->dest));



	if ((orig_node != NULL) &&

	    (orig_node->batman_if != NULL) &&

	    (orig_node->router != NULL)) {



		/* don't lock while sending the packets ... we therefore

		 * copy the required data before sending */

		batman_if = orig_node->batman_if;

		batman_if = orig_node->router->if_incoming;

		memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);

		spin_unlock_irqrestore(&orig_hash_lock, flags);

drivers/staging/batman-adv/soft-interface.c

+2 −3
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev) 
			orig_node = transtable_search(ethhdr->h_dest);



		if ((orig_node) &&

		    (orig_node->batman_if) &&

		    (orig_node->router)) {

			if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0)

				goto unlock;
@@ -252,13 +251,13 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev) 
			memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);



			/* net_dev won't be available when not active */

			if (orig_node->batman_if->if_active != IF_ACTIVE)

			if (orig_node->router->if_incoming->if_active != IF_ACTIVE)

				goto unlock;



			/* don't lock while sending the packets ... we therefore

			 * copy the required data before sending */



			batman_if = orig_node->batman_if;

			batman_if = orig_node->router->if_incoming;

			memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);

			spin_unlock_irqrestore(&orig_hash_lock, flags);

drivers/staging/batman-adv/types.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ struct batman_if { 
struct orig_node {               /* structure for orig_list maintaining nodes of mesh */

	uint8_t orig[ETH_ALEN];

	struct neigh_node *router;

	struct batman_if *batman_if;

	TYPE_OF_WORD *bcast_own;

	uint8_t *bcast_own_sum;

	uint8_t tq_own;