Skip to contentSkip to conversation

net/ipv4: avoid compile error in fib_info_nh_uses_dev

PATCH In review Eric Dumazet 3 participants 3 messages Sep 21, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ipv4: avoid compile error in fib_info_nh_uses_dev

net/ipv4/fib_frontend.c: In function 'fib_info_nh_uses_dev':
net/ipv4/fib_frontend.c:322:6: error: unused variable 'ret' [-Werror=unused-variable]
cc1: all warnings being treated as errors

Fixes 78f2756c5fc0 ("net/ipv4: Move device validation to helper")
Cc David Ahern <[email protected]>
---
 net/ipv4/fib_frontend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/fib_frontend.c +1 -1
index 222b968de94cbff98c4a1b4a2f298b2e68452984..30e2bcc3ef2a293568076228fecf3cf07ba01f20 100644
@@ -318,9 +318,9 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
 bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)
 {
 	bool dev_match = false;
+#ifdef CONFIG_IP_ROUTE_MULTIPATH
 	int ret;
 
-#ifdef CONFIG_IP_ROUTE_MULTIPATH
 	for (ret = 0; ret < fi->fib_nhs; ret++) {
 		struct fib_nh *nh = &fi->fib_nh[ret];
 
Signature · 1 line
2.19.0.444.g18242da7ef-goog
#1 lore raw
Quoted 8 lines · Eric Dumazet

net/ipv4/fib_frontend.c: In function 'fib_info_nh_uses_dev':
net/ipv4/fib_frontend.c:322:6: error: unused variable 'ret' [-Werror=unused-variable]
cc1: all warnings being treated as errors

Fixes 78f2756c5fc0 ("net/ipv4: Move device validation to helper")
Cc David Ahern <[email protected]>

This targets net-next tree, sorry for the wrong tag in title.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Eric Dumazet
Quoted 17 lines · Eric Dumazet

net/ipv4/fib_frontend.c: In function 'fib_info_nh_uses_dev':
net/ipv4/fib_frontend.c:322:6: error: unused variable 'ret' [-Werror=unused-variable]
cc1: all warnings being treated as errors

Fixes 78f2756c5fc0 ("net/ipv4: Move device validation to helper")
Cc David Ahern <[email protected]>
---
 net/ipv4/fib_frontend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/fib_frontend.c +0 -0
index 222b968de94cbff98c4a1b4a2f298b2e68452984..30e2bcc3ef2a293568076228fecf3cf07ba01f20 100644

net/ipv4/fib_frontend.c __be32 fib_compute_spec_dst(struct sk_buff *skb) · line 326

Quoted 10 lines
net/ipv4/fib_frontend.c +1 -1
@@ -318,9 +318,9 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
 bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)
 {
 	bool dev_match = false;
+#ifdef CONFIG_IP_ROUTE_MULTIPATH
 	int ret;
 
-#ifdef CONFIG_IP_ROUTE_MULTIPATH
 	for (ret = 0; ret < fi->fib_nhs; ret++) {
 		struct fib_nh *nh = &fi->fib_nh[ret];
 

Thanks for the fix.