diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-18 14:57:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-18 14:57:59 -0700 |
| commit | 8f623a10c31bf7dd9cbb10bb53555b83d5ea3192 (patch) | |
| tree | 6237c1afcea47b5088f5d5b2ba8780784821e54c /net/batman-adv/routing.c | |
| parent | a128592799b89d3985331d261fa4d41868ee4b04 (diff) | |
| parent | 2369e827046920ef0599e6a36b975ac5c0a359c2 (diff) | |
Merge tag 'batadv-net-for-davem-20200918' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are some batman-adv bugfixes:
- fix wrong type use in backbone_gw hash, by Linus Luessing
- disable TT re-routing for multicast packets, by Linus Luessing
- Add missing include for in_interrupt(), by Sven Eckelmann
- fix BLA/multicast issues for packets sent via unicast,
by Linus Luessing (3 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 27cdf5e4349a..9e5c71e406ff 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -826,6 +826,10 @@ static bool batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, vid = batadv_get_vid(skb, hdr_len); ethhdr = (struct ethhdr *)(skb->data + hdr_len); + /* do not reroute multicast frames in a unicast header */ + if (is_multicast_ether_addr(ethhdr->h_dest)) + return true; + /* check if the destination client was served by this node and it is now * roaming. In this case, it means that the node has got a ROAM_ADV * message and that it knows the new destination in the mesh to re-route |