diff options
| author | Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2012-01-22 20:00:25 +0100 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-04-11 14:28:59 +0200 |
| commit | b1a8c04b8af74158e006b92a9e7e0f619e1a9409 (patch) | |
| tree | adef581f143ddcd055313574a1f5b650a3521686 /net/batman-adv | |
| parent | fe2da6ff27c73c1d102ec2189f94e8bc729d1a9b (diff) | |
| download | linux-b1a8c04b8af74158e006b92a9e7e0f619e1a9409.tar.bz2 | |
batman-adv: drop STP over batman
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 4d639b303bd7..10ab49aa568f 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -130,6 +130,8 @@ 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; + static const 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 +161,12 @@ 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; |