aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/soft-interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r--net/batman-adv/soft-interface.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 2d1f89517d99..54800c783f96 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -347,6 +347,12 @@ void batadv_interface_rx(struct net_device *soft_iface,
347 347
348 soft_iface->last_rx = jiffies; 348 soft_iface->last_rx = jiffies;
349 349
350 /* Let the bridge loop avoidance check the packet. If will
351 * not handle it, we can safely push it up.
352 */
353 if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
354 goto out;
355
350 if (orig_node) 356 if (orig_node)
351 batadv_tt_add_temporary_global_entry(bat_priv, orig_node, 357 batadv_tt_add_temporary_global_entry(bat_priv, orig_node,
352 ethhdr->h_source); 358 ethhdr->h_source);
@@ -354,12 +360,6 @@ void batadv_interface_rx(struct net_device *soft_iface,
354 if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) 360 if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
355 goto dropped; 361 goto dropped;
356 362
357 /* Let the bridge loop avoidance check the packet. If will
358 * not handle it, we can safely push it up.
359 */
360 if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
361 goto out;
362
363 netif_rx(skb); 363 netif_rx(skb);
364 goto out; 364 goto out;
365 365