]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
ip address: Move filter struct to ip_common.h
authorDavid Ahern <dsahern@gmail.com>
Sat, 27 May 2017 23:34:48 +0000 (17:34 -0600)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 31 May 2017 00:54:03 +0000 (17:54 -0700)
Move filter struct to ip_common.h as struct link_filter.

Signed-off-by: David Ahern <dsahern@gmail.com>
ip/ip_common.h
ip/ipaddress.c

index 450b45ac2b606a7e2e8aa1236659e4ef86268323..2b3cf7049b65a726db3dfd12de0cdddf07fe39f7 100644 (file)
@@ -1,3 +1,23 @@
+struct link_filter {
+       int ifindex;
+       int family;
+       int oneline;
+       int showqueue;
+       inet_prefix pfx;
+       int scope, scopemask;
+       int flags, flagmask;
+       int up;
+       char *label;
+       int flushed;
+       char *flushb;
+       int flushp;
+       int flushe;
+       int group;
+       int master;
+       char *kind;
+       char *slave_kind;
+};
+
 int get_operstate(const char *name);
 int print_linkinfo(const struct sockaddr_nl *who,
                   struct nlmsghdr *n, void *arg);
index c805b929134d878dccba4957e9db50bcc0053894..3e2c38a8e53e4658d87fb44e4eda1b4ed3d5abf1 100644 (file)
@@ -44,27 +44,7 @@ enum {
        IPADD_SAVE,
 };
 
-static struct
-{
-       int ifindex;
-       int family;
-       int oneline;
-       int showqueue;
-       inet_prefix pfx;
-       int scope, scopemask;
-       int flags, flagmask;
-       int up;
-       char *label;
-       int flushed;
-       char *flushb;
-       int flushp;
-       int flushe;
-       int group;
-       int master;
-       char *kind;
-       char *slave_kind;
-} filter;
-
+static struct link_filter filter;
 static int do_link;
 
 static void usage(void) __attribute__((noreturn));