The flow filter implementaion requires minimal changes to the existing virtio_net implementation. It's cleaner to separate it into another file. In order to do so, move virtio_net.c into the new virtio_net directory, and create a makefile for it. Note the name is changed to virtio_net_main.c, so the module can retain the name virtio_net.
Signed-off-by: Daniel Jurgens <dani...@nvidia.com> Reviewed-by: Parav Pandit <pa...@nvidia.com> Reviewed-by: Shahar Shitrit <shshit...@nvidia.com> --- MAINTAINERS | 2 +- drivers/net/Makefile | 2 +- drivers/net/virtio_net/Makefile | 8 ++++++++ .../net/{virtio_net.c => virtio_net/virtio_net_main.c} | 0 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 drivers/net/virtio_net/Makefile rename drivers/net/{virtio_net.c => virtio_net/virtio_net_main.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index bce96dd254b8..588252363a77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -26625,7 +26625,7 @@ F: Documentation/devicetree/bindings/virtio/ F: Documentation/driver-api/virtio/ F: drivers/block/virtio_blk.c F: drivers/crypto/virtio/ -F: drivers/net/virtio_net.c +F: drivers/net/virtio_net/ F: drivers/vdpa/ F: drivers/virtio/ F: include/linux/vdpa.h diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 73bc63ecd65f..cf28992658a6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -33,7 +33,7 @@ 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_VIRTIO_NET) += virtio_net/ obj-$(CONFIG_VXLAN) += vxlan/ obj-$(CONFIG_GENEVE) += geneve.o obj-$(CONFIG_BAREUDP) += bareudp.o diff --git a/drivers/net/virtio_net/Makefile b/drivers/net/virtio_net/Makefile new file mode 100644 index 000000000000..c0a4725ddd69 --- /dev/null +++ b/drivers/net/virtio_net/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for the VirtIO Net driver +# + +obj-$(CONFIG_VIRTIO_NET) += virtio_net.o + +virtio_net-objs := virtio_net_main.o diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net/virtio_net_main.c similarity index 100% rename from drivers/net/virtio_net.c rename to drivers/net/virtio_net/virtio_net_main.c -- 2.50.1