Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 335762
b: refs/heads/master
c: 74490f9
h: refs/heads/master
v: v3
  • Loading branch information
Antonio Quartulli committed Nov 16, 2012
1 parent 1d39b79 commit cf5f00a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1f36aebcc5fa53c5d98f3329186466b5eb76a168
refs/heads/master: 74490f969155caf1ec945ad2d35d3a8eec6be71d
12 changes: 6 additions & 6 deletions trunk/net/batman-adv/soft-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,19 +325,19 @@ void batadv_interface_rx(struct net_device *soft_iface,

soft_iface->last_rx = jiffies;

/* Let the bridge loop avoidance check the packet. If will
* not handle it, we can safely push it up.
*/
if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
goto out;

if (orig_node)
batadv_tt_add_temporary_global_entry(bat_priv, orig_node,
ethhdr->h_source);

if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
goto dropped;

/* Let the bridge loop avoidance check the packet. If will
* not handle it, we can safely push it up.
*/
if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
goto out;

netif_rx(skb);
goto out;

Expand Down

0 comments on commit cf5f00a

Please sign in to comment.