net: Remove vrf header file

Move remaining structs to VRF driver and delete the vrf header file.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index 3f2d7a9d0bbfe125f32b44179bd45ef2516b5522..fa43fa2f30e4a580864ee87b37901f35ae2bcb93 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11273,7 +11273,6 @@ M:      Shrijeet Mukherjee <shm@cumulusnetworks.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/vrf.c
-F:     include/net/vrf.h
 F:     Documentation/networking/vrf.txt
 
 VT1211 HARDWARE MONITOR DRIVER

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index df872f4efb0d5d5453daddcaf8f6242bc6b8dabf..64f2ab663ffe0fe4d56524927c8b4a46781478a2 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -34,7 +34,6 @@
 #include <net/rtnetlink.h>
 #include <net/route.h>
 #include <net/addrconf.h>
-#include <net/vrf.h>
 #include <net/l3mdev.h>
 
 #define DRV_NAME       "vrf"
@@ -45,6 +44,21 @@
 #define vrf_master_get_rcu(dev) \
        ((struct net_device *)rcu_dereference(dev->rx_handler_data))
 
+struct slave {
+       struct list_head        list;
+       struct net_device       *dev;
+};
+
+struct slave_queue {
+       struct list_head        all_slaves;
+};
+
+struct net_vrf {
+       struct slave_queue      queue;
+       struct rtable           *rth;
+       u32                     tb_id;
+};
+
 struct pcpu_dstats {
        u64                     tx_pkts;
        u64                     tx_bytes;

diff --git a/include/net/vrf.h b/include/net/vrf.h
deleted file mode 100644 (file)
index e83fc38..0000000
--- a/include/net/vrf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * include/net/net_vrf.h - adds vrf dev structure definitions
- * Copyright (c) 2015 Cumulus Networks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __LINUX_NET_VRF_H
-#define __LINUX_NET_VRF_H
-
-struct slave {
-       struct list_head        list;
-       struct net_device       *dev;
-};
-
-struct slave_queue {
-       struct list_head        all_slaves;
-};
-
-struct net_vrf {
-       struct slave_queue      queue;
-       struct rtable           *rth;
-       u32                     tb_id;
-};
-
-#endif /* __LINUX_NET_VRF_H */