Skip to content

Commit

Permalink
batman-adv: Remove unused primary_if and bat_priv variables
Browse files Browse the repository at this point in the history
Fixes: ef0a937 ("batman-adv: consider outgoing interface in OGM sending")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
  • Loading branch information
Linus Lüssing authored and Simon Wunderlich committed Aug 9, 2016
1 parent f4acb10 commit f55a2e8
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions net/batman-adv/bat_iv_ogm.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,36 +528,25 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
{
struct net_device *soft_iface;
struct batadv_priv *bat_priv;
struct batadv_hard_iface *primary_if = NULL;

if (!forw_packet->if_incoming) {
pr_err("Error - can't forward packet: incoming iface not specified\n");
goto out;
return;
}

soft_iface = forw_packet->if_incoming->soft_iface;
bat_priv = netdev_priv(soft_iface);

if (WARN_ON(!forw_packet->if_outgoing))
goto out;
return;

if (WARN_ON(forw_packet->if_outgoing->soft_iface != soft_iface))
goto out;
return;

if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE)
goto out;

primary_if = batadv_primary_if_get_selected(bat_priv);
if (!primary_if)
goto out;
return;

/* only for one specific outgoing interface */
batadv_iv_ogm_send_to_if(forw_packet, forw_packet->if_outgoing);

out:
if (primary_if)
batadv_hardif_put(primary_if);
}

/**
Expand Down

0 comments on commit f55a2e8

Please sign in to comment.