]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
ipmroute: Prevent overlapping storage of `filter` global
authorMichael Forney <mforney@mforney.org>
Sun, 16 Jun 2019 21:46:02 +0000 (14:46 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 18 Jun 2019 16:43:29 +0000 (09:43 -0700)
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>
ip/ipmroute.c

index 6cf91fe934a76c9e3aad72d7dbebf66a0730ade1..3537bdf4de5b21325a76b7cbf7902bde4f4dea31 100644 (file)
@@ -44,7 +44,7 @@ static void usage(void)
        exit(-1);
 }
 
-struct rtfilter {
+static struct rtfilter {
        int tb;
        int af;
        int iif;