projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa...
[firefly-linux-kernel-4.4.55.git]
/
net
/
bridge
/
br_input.c
diff --git
a/net/bridge/br_input.c
b/net/bridge/br_input.c
index f3ac1e858ee1c321484fc59a67451efab47e0f0d..f06ee39c73fd64dfe958e6f94e735e60e3ba0b78 100644
(file)
--- a/
net/bridge/br_input.c
+++ b/
net/bridge/br_input.c
@@
-60,7
+60,7
@@
int br_handle_frame_finish(struct sk_buff *skb)
br = p->br;
br_fdb_update(br, p, eth_hdr(skb)->h_source);
br = p->br;
br_fdb_update(br, p, eth_hdr(skb)->h_source);
- if (is_multicast_ether_addr(dest) &&
+ if (
!is_broadcast_ether_addr(dest) &&
is_multicast_ether_addr(dest) &&
br_multicast_rcv(br, p, skb))
goto drop;
br_multicast_rcv(br, p, skb))
goto drop;
@@
-77,7
+77,9
@@
int br_handle_frame_finish(struct sk_buff *skb)
dst = NULL;
dst = NULL;
- if (is_multicast_ether_addr(dest)) {
+ if (is_broadcast_ether_addr(dest))
+ skb2 = skb;
+ else if (is_multicast_ether_addr(dest)) {
mdst = br_mdb_get(br, skb);
if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
if ((mdst && mdst->mglist) ||
mdst = br_mdb_get(br, skb);
if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
if ((mdst && mdst->mglist) ||