1513b39a8c
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
11 lines
342 B
Diff
11 lines
342 B
Diff
--- a/net/bridge/br_input.c
|
|
+++ b/net/bridge/br_input.c
|
|
@@ -84,7 +84,7 @@ int br_handle_frame_finish(struct sk_buf
|
|
br_multicast_rcv(br, p, skb, vid))
|
|
goto drop;
|
|
|
|
- if (p->state == BR_STATE_LEARNING)
|
|
+ if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
|
|
goto drop;
|
|
|
|
BR_INPUT_SKB_CB(skb)->brdev = br->dev;
|