Commit ec539514 authored by David Ahern's avatar David Ahern Committed by David S. Miller

net: Remove vrf header file

Move remaining structs to VRF driver and delete the vrf header file.
Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93a7e7e8
...@@ -11273,7 +11273,6 @@ M: Shrijeet Mukherjee <shm@cumulusnetworks.com> ...@@ -11273,7 +11273,6 @@ M: Shrijeet Mukherjee <shm@cumulusnetworks.com>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: drivers/net/vrf.c F: drivers/net/vrf.c
F: include/net/vrf.h
F: Documentation/networking/vrf.txt F: Documentation/networking/vrf.txt
VT1211 HARDWARE MONITOR DRIVER VT1211 HARDWARE MONITOR DRIVER
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include <net/route.h> #include <net/route.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/vrf.h>
#include <net/l3mdev.h> #include <net/l3mdev.h>
#define DRV_NAME "vrf" #define DRV_NAME "vrf"
...@@ -45,6 +44,21 @@ ...@@ -45,6 +44,21 @@
#define vrf_master_get_rcu(dev) \ #define vrf_master_get_rcu(dev) \
((struct net_device *)rcu_dereference(dev->rx_handler_data)) ((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 { struct pcpu_dstats {
u64 tx_pkts; u64 tx_pkts;
u64 tx_bytes; u64 tx_bytes;
......
/*
* 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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment