Move remaining structs to VRF driver and delete the vrf header file.
Signed-off-by: David Ahern <d...@cumulusnetworks.com>
---
MAINTAINERS | 1 -
drivers/net/vrf.c | 16 +++++++++++++++-
include/net/vrf.h | 29 -----------------------------
3 files changed, 15 insertions(+), 31 deletions(-)
delete mode 100644 include/net/vrf.h
diff --git a/MAINTAINERS b/MAINTAINERS
index a88c99988022..9ec9423c57c3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11249,7 +11249,6 @@ M: Shrijeet Mukherjee <s...@cumulusnetworks.com>
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/vrf.c
-F: include/net/vrf.h
VT1211 HARDWARE MONITOR DRIVER
M: Juerg Haefliger <jue...@gmail.com>
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index c4f036b400eb..a3d5bcabbc48 100644
--- 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
index e83fc38770dd..000000000000
--- 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 */
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
