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

Commit 6535db56 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Remove unused parameter recv_if of batadv_interface_rx 



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 c047c3b1

net/batman-adv/routing.c

+2 −3
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, 
							hdr_size))

			goto rx_success;



		batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size,

		batadv_interface_rx(recv_if->soft_iface, skb, hdr_size,

				    orig_node);



rx_success:
@@ -1122,8 +1122,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, 
		goto rx_success;



	/* broadcast for me */

	batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size,

			    orig_node);

	batadv_interface_rx(recv_if->soft_iface, skb, hdr_size, orig_node);



rx_success:

	ret = NET_RX_SUCCESS;

net/batman-adv/soft-interface.c

+2 −3
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ static int batadv_interface_tx(struct sk_buff *skb, 
 * batadv_interface_rx - receive ethernet frame on local batman-adv interface

 * @soft_iface: local interface which will receive the ethernet frame

 * @skb: ethernet frame for @soft_iface

 * @recv_if: interface on which the batman-adv packet was received

 * @hdr_size: size of already parsed batman-adv header

 * @orig_node: originator from which the batman-adv packet was sent

 *
@@ -400,8 +399,8 @@ static int batadv_interface_tx(struct sk_buff *skb, 
 * isolated clients.

 */

void batadv_interface_rx(struct net_device *soft_iface,

			 struct sk_buff *skb, struct batadv_hard_iface *recv_if,

			 int hdr_size, struct batadv_orig_node *orig_node)

			 struct sk_buff *skb, int hdr_size,

			 struct batadv_orig_node *orig_node)

{

	struct batadv_bcast_packet *batadv_bcast_packet;

	struct batadv_priv *bat_priv = netdev_priv(soft_iface);

net/batman-adv/soft-interface.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ struct sk_buff; 


int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);

void batadv_interface_rx(struct net_device *soft_iface,

			 struct sk_buff *skb, struct batadv_hard_iface *recv_if,

			 int hdr_size, struct batadv_orig_node *orig_node);

			 struct sk_buff *skb, int hdr_size,

			 struct batadv_orig_node *orig_node);

struct net_device *batadv_softif_create(const char *name);

void batadv_softif_destroy_sysfs(struct net_device *soft_iface);

int batadv_softif_is_valid(const struct net_device *net_dev);