diff options
author | Denys Dmytriyenko <denys@ti.com> | 2012-06-11 20:44:56 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-06-11 20:44:56 -0400 |
commit | 88867c1d96684925027a0ecc9e25c6ea70040cc6 (patch) | |
tree | e1ad8651aa7663850f6dc1108b278f56a2b92a91 /extras/recipes-kernel/linux/linux-omap/linus/0060-bridge-stp-ensure-mac-header-is-set.patch | |
parent | a1e2573369c6714956af561523ba274aa9c185f7 (diff) | |
download | meta-ti-split.tar.gz |
extras: move things to extrassplit
Move non-essential, outdated, best-effort pieces, as well, as those requiring
extra non-standard dependencies besides oe-core.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap/linus/0060-bridge-stp-ensure-mac-header-is-set.patch')
-rw-r--r-- | extras/recipes-kernel/linux/linux-omap/linus/0060-bridge-stp-ensure-mac-header-is-set.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap/linus/0060-bridge-stp-ensure-mac-header-is-set.patch b/extras/recipes-kernel/linux/linux-omap/linus/0060-bridge-stp-ensure-mac-header-is-set.patch new file mode 100644 index 00000000..ad0b8e1b --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap/linus/0060-bridge-stp-ensure-mac-header-is-set.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From ff26fe4db962b41b794fb81518b8e407093239d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Westphal <fw@strlen.de> | ||
3 | Date: Mon, 3 Jan 2011 04:16:28 +0000 | ||
4 | Subject: [PATCH 60/65] bridge: stp: ensure mac header is set | ||
5 | |||
6 | commit bf9ae5386bca8836c16e69ab8fdbe46767d7452a | ||
7 | (llc: use dev_hard_header) removed the | ||
8 | skb_reset_mac_header call from llc_mac_hdr_init. | ||
9 | |||
10 | This seems fine itself, but br_send_bpdu() invokes ebtables LOCAL_OUT. | ||
11 | |||
12 | We oops in ebt_basic_match() because it assumes eth_hdr(skb) returns | ||
13 | a meaningful result. | ||
14 | |||
15 | Cc: acme@ghostprotocols.net | ||
16 | References: https://bugzilla.kernel.org/show_bug.cgi?id=24532 | ||
17 | Signed-off-by: Florian Westphal <fw@strlen.de> | ||
18 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
19 | --- | ||
20 | net/bridge/br_stp_bpdu.c | 2 ++ | ||
21 | 1 files changed, 2 insertions(+), 0 deletions(-) | ||
22 | |||
23 | diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c | ||
24 | index 35cf270..e3d7aef 100644 | ||
25 | --- a/net/bridge/br_stp_bpdu.c | ||
26 | +++ b/net/bridge/br_stp_bpdu.c | ||
27 | @@ -50,6 +50,8 @@ static void br_send_bpdu(struct net_bridge_port *p, | ||
28 | |||
29 | llc_mac_hdr_init(skb, p->dev->dev_addr, p->br->group_addr); | ||
30 | |||
31 | + skb_reset_mac_header(skb); | ||
32 | + | ||
33 | NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, | ||
34 | dev_queue_xmit); | ||
35 | } | ||
36 | -- | ||
37 | 1.6.6.1 | ||
38 | |||