projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c03ee8
)
bridge: fix compile error when compiling without IPv6 support
author
Linus Lüssing
<
[email protected]
>
Wed, 11 Jun 2014 23:41:24 +0000
(
01:41
+0200)
committer
David S. Miller
<
[email protected]
>
Thu, 12 Jun 2014 18:00:24 +0000
(11:00 -0700)
Some fields in "struct net_bridge" aren't available when compiling the
kernel without IPv6 support. Therefore adding a check/macro to skip the
complaining code sections in that case.
Introduced by
2cd4143192e8c60f66cb32c3a30c76d0470a372d
("bridge: memorize and export selected IGMP/MLD querier port")
Reported-by: kbuild test robot <
[email protected]
>
Signed-off-by: Linus Lüssing <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/bridge/br_multicast.c
patch
|
blob
|
history
diff --git
a/net/bridge/br_multicast.c
b/net/bridge/br_multicast.c
index 876e5fb2a786fa558d67854d724017de91c661f5..abfa0b65a1118eb0abae4dd69f78e7285537acd8 100644
(file)
--- a/
net/bridge/br_multicast.c
+++ b/
net/bridge/br_multicast.c
@@
-2246,11
+2246,13
@@
bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto)
rcu_dereference(br->ip4_querier.port) == port)
goto unlock;
break;
+#if IS_ENABLED(CONFIG_IPV6)
case ETH_P_IPV6:
if (!timer_pending(&br->ip6_other_query.timer) ||
rcu_dereference(br->ip6_querier.port) == port)
goto unlock;
break;
+#endif
default:
goto unlock;
}