projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux
[cascardo/linux.git]
/
net
/
bridge
/
br_input.c
diff --git
a/net/bridge/br_input.c
b/net/bridge/br_input.c
index
53b3985
..
d74d570
100644
(file)
--- a/
net/bridge/br_input.c
+++ b/
net/bridge/br_input.c
@@
-70,7
+70,7
@@
int br_handle_frame_finish(struct sk_buff *skb)
if (is_multicast_ether_addr(dest)) {
mdst = br_mdb_get(br, skb);
if (is_multicast_ether_addr(dest)) {
mdst = br_mdb_get(br, skb);
- if (mdst || BR_INPUT_SKB_CB
(skb)->mrouters_only
) {
+ if (mdst || BR_INPUT_SKB_CB
_MROUTERS_ONLY(skb)
) {
if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
br_multicast_is_router(br))
skb2 = skb;
if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
br_multicast_is_router(br))
skb2 = skb;
@@
-90,7
+90,7
@@
int br_handle_frame_finish(struct sk_buff *skb)
if (skb) {
if (dst)
if (skb) {
if (dst)
- br_forward(dst->dst, skb);
+ br_forward(dst->dst, skb
, skb2
);
else
br_flood_forward(br, skb, skb2);
}
else
br_flood_forward(br, skb, skb2);
}