From: Michael Forney <mforney@mforney.org>
Date: Sun, 16 Jun 2019 21:46:02 +0000 (-0700)
Subject: ipmroute: Prevent overlapping storage of `filter` global
X-Git-Tag: v5.2.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=578cadcc68035943062d74507c3b7989741b353f;p=thirdparty%2Fiproute2.git

ipmroute: Prevent overlapping storage of `filter` global

This variable has the same name as `struct xfrm_filter filter` in
ip/ipxfrm.c, but overrides that definition since `struct rtfilter`
is larger.

This is visible when built with -Wl,--warn-common in LDFLAGS:

	/usr/bin/ld: ipxfrm.o: warning: common of `filter' overridden by larger common from ipmroute.o

Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 6cf91fe93..3537bdf4d 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -44,7 +44,7 @@ static void usage(void)
 	exit(-1);
 }
 
-struct rtfilter {
+static struct rtfilter {
 	int tb;
 	int af;
 	int iif;