[PATCH 14/16] batman-adv: drop STP over batman
From: Antonio Quartulli <hidden>
Date: 2012-04-05 10:39:00
Also in:
batman
Subsystem:
batman advanced, the rest · Maintainers:
Marek Lindner, Simon Wunderlich, Antonio Quartulli, Sven Eckelmann, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2012-04-11 · [PATCH 14/16] batman-adv: drop STP over batman · Antonio Quartulli <hidden>
- 2012-04-07 · [PATCH 14/16] batman-adv: drop STP over batman · Antonio Quartulli <hidden>
From: Simon Wunderlich <redacted> Signed-off-by: Simon Wunderlich <redacted> Signed-off-by: Antonio Quartulli <redacted> --- net/batman-adv/soft-interface.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 9a21e9f..7585029 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c@@ -130,6 +130,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) struct hard_iface *primary_if = NULL; struct bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; + uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; unsigned int header_len = 0; int data_len = skb->len, ret; short vid = -1;
@@ -159,6 +160,11 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) /* Register the client MAC in the transtable */ tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); + /* don't accept stp packets. STP does not help in meshes. + * better use the bridge loop avoidance ... */ + if (compare_eth(ethhdr->h_dest, stp_addr)) + goto dropped; + if (is_multicast_ether_addr(ethhdr->h_dest)) { do_bcast = true;
--
1.7.9.4