diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2013-02-11 03:22:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-11 14:16:52 -0500 |
commit | 547b4e718115eea74087e28d7fa70aec619200db (patch) | |
tree | 0e5b250f09d517e55173194527651c9fa64ba6bd /net/bridge | |
parent | cfa82e020bc0be6ab9a1e3c186fe41f1e5cecf7a (diff) |
bridge: set priority of STP packets
Spanning Tree Protocol packets should have always been marked as
control packets, this causes them to get queued in the high prirority
FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge
gets overloaded and can't communicate. This is a long-standing bug back
to the first versions of Linux bridge.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_stp_bpdu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 7f884e3fb955..8660ea3be705 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/etherdevice.h> | 16 | #include <linux/etherdevice.h> |
17 | #include <linux/llc.h> | 17 | #include <linux/llc.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/pkt_sched.h> | ||
19 | #include <net/net_namespace.h> | 20 | #include <net/net_namespace.h> |
20 | #include <net/llc.h> | 21 | #include <net/llc.h> |
21 | #include <net/llc_pdu.h> | 22 | #include <net/llc_pdu.h> |
@@ -40,6 +41,7 @@ static void br_send_bpdu(struct net_bridge_port *p, | |||
40 | 41 | ||
41 | skb->dev = p->dev; | 42 | skb->dev = p->dev; |
42 | skb->protocol = htons(ETH_P_802_2); | 43 | skb->protocol = htons(ETH_P_802_2); |
44 | skb->priority = TC_PRIO_CONTROL; | ||
43 | 45 | ||
44 | skb_reserve(skb, LLC_RESERVE); | 46 | skb_reserve(skb, LLC_RESERVE); |
45 | memcpy(__skb_put(skb, length), data, length); | 47 | memcpy(__skb_put(skb, length), data, length); |