Commit 9a393b5d authored by Sainath Grandhi's avatar Sainath Grandhi Committed by David S. Miller
Browse files

tap: tap as an independent module 



This patch makes tap a separate module for other types of virtual interfaces, for example,
ipvlan to use.

Signed-off-by: default avatarSainath Grandhi <sainath.grandhi@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9f1f61c

drivers/net/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ config MACVTAP 
	tristate "MAC-VLAN based tap driver"

	depends on MACVLAN

	depends on INET

	select TAP

	help

	  This adds a specialized tap character device driver that is based

	  on the MAC-VLAN network interface, called macvtap. A macvtap device
@@ -287,6 +288,12 @@ config TUN 


	  If you don't know what to use this for, you don't need it.



config TAP

	tristate

	---help---

	  This option is selected by any driver implementing tap user space

	  interface for a virtual interface to re-use core tap functionality.



config TUN_VNET_CROSS_LE

	bool "Support for cross-endian vnet headers on little-endian kernels"

	default n

drivers/net/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_PHYLIB) += phy/ 
obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_NET_TEAM) += team/

obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_TAP) += tap.o

obj-$(CONFIG_VETH) += veth.o

obj-$(CONFIG_VIRTIO_NET) += virtio_net.o

obj-$(CONFIG_VXLAN) += vxlan.o
@@ -29,8 +30,6 @@ obj-$(CONFIG_GTP) += gtp.o 
obj-$(CONFIG_NLMON) += nlmon.o

obj-$(CONFIG_NET_VRF) += vrf.o



macvtap-objs := macvtap_main.o tap.o



#

# Networking Drivers

#

drivers/net/macvtap_main.c→drivers/net/macvtap.c

+0 −0

File moved.

View file

drivers/net/tap.c

+11 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ void tap_del_queues(struct tap_dev *tap) 
	/* guarantee that any future tap_set_queue will fail */

	tap->numvtaps = MAX_TAP_QUEUES;

}

EXPORT_SYMBOL_GPL(tap_del_queues);



rx_handler_result_t tap_handle_frame(struct sk_buff **pskb)

{
@@ -389,6 +390,7 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb) 
	kfree_skb(skb);

	return RX_HANDLER_CONSUMED;

}

EXPORT_SYMBOL_GPL(tap_handle_frame);



static struct major_info *tap_get_major(int major)

{
@@ -428,6 +430,7 @@ int tap_get_minor(dev_t major, struct tap_dev *tap) 
	rcu_read_unlock();

	return retval < 0 ? retval : 0;

}

EXPORT_SYMBOL_GPL(tap_get_minor);



void tap_free_minor(dev_t major, struct tap_dev *tap)

{
@@ -449,6 +452,7 @@ void tap_free_minor(dev_t major, struct tap_dev *tap) 
unlock:

	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(tap_free_minor);



static struct tap_dev *dev_get_by_tap_file(int major, int minor)

{
@@ -1210,6 +1214,7 @@ int tap_queue_resize(struct tap_dev *tap) 
	kfree(arrays);

	return ret;

}

EXPORT_SYMBOL_GPL(tap_queue_resize);



static int tap_list_add(dev_t major, const char *device_name)

{
@@ -1257,6 +1262,7 @@ int tap_create_cdev(struct cdev *tap_cdev, 
out1:

	return err;

}

EXPORT_SYMBOL_GPL(tap_create_cdev);



void tap_destroy_cdev(dev_t major, struct cdev *tap_cdev)

{
@@ -1272,3 +1278,8 @@ void tap_destroy_cdev(dev_t major, struct cdev *tap_cdev) 
		}

	}

}

EXPORT_SYMBOL_GPL(tap_destroy_cdev);



MODULE_AUTHOR("Arnd Bergmann <arnd@arndb.de>");

MODULE_AUTHOR("Sainath Grandhi <sainath.grandhi@intel.com>");

MODULE_LICENSE("GPL");

drivers/vhost/Kconfig

+1 −1
Original line number Diff line number Diff line 
config VHOST_NET

	tristate "Host kernel accelerator for virtio net"

	depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP)

	depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP)

	select VHOST

	---help---

	  This kernel module can be loaded in host kernel to accelerate