diff options
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index b9a28d2dd3e8..ce0684a1fc83 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
| @@ -325,6 +325,12 @@ void batadv_interface_rx(struct net_device *soft_iface, | |||
| 325 | 325 | ||
| 326 | soft_iface->last_rx = jiffies; | 326 | soft_iface->last_rx = jiffies; |
| 327 | 327 | ||
| 328 | /* Let the bridge loop avoidance check the packet. If will | ||
| 329 | * not handle it, we can safely push it up. | ||
| 330 | */ | ||
| 331 | if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) | ||
| 332 | goto out; | ||
| 333 | |||
| 328 | if (orig_node) | 334 | if (orig_node) |
| 329 | batadv_tt_add_temporary_global_entry(bat_priv, orig_node, | 335 | batadv_tt_add_temporary_global_entry(bat_priv, orig_node, |
| 330 | ethhdr->h_source); | 336 | ethhdr->h_source); |
| @@ -332,12 +338,6 @@ void batadv_interface_rx(struct net_device *soft_iface, | |||
| 332 | if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) | 338 | if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) |
| 333 | goto dropped; | 339 | goto dropped; |
| 334 | 340 | ||
| 335 | /* Let the bridge loop avoidance check the packet. If will | ||
| 336 | * not handle it, we can safely push it up. | ||
| 337 | */ | ||
| 338 | if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) | ||
| 339 | goto out; | ||
| 340 | |||
| 341 | netif_rx(skb); | 341 | netif_rx(skb); |
| 342 | goto out; | 342 | goto out; |
| 343 | 343 | ||
