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

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
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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
+15 −1
Original line number Diff line number Diff line
@@ -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;

include/net/vrf.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line
/*
 * 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 */