Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: mana: Move header files to a common location

In preparation to add MANA RDMA driver, move all the required header files
to a common location for use by both Ethernet and RDMA drivers.

Reviewed-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Long Li <longli@microsoft.com>
Link: https://lore.kernel.org/r/1667502990-2559-8-git-send-email-longli@linuxonhyperv.com
Acked-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>

authored by

Long Li and committed by
Leon Romanovsky
fd325cd6 d44089e5

+9 -8
+1
MAINTAINERS
··· 9541 9541 F: include/asm-generic/mshyperv.h 9542 9542 F: include/clocksource/hyperv_timer.h 9543 9543 F: include/linux/hyperv.h 9544 + F: include/net/mana 9544 9545 F: include/uapi/linux/hyperv.h 9545 9546 F: net/vmw_vsock/hyperv_transport.c 9546 9547 F: tools/hv/
drivers/net/ethernet/microsoft/mana/gdma.h include/net/mana/gdma.h
+1 -1
drivers/net/ethernet/microsoft/mana/gdma_main.c
··· 6 6 #include <linux/utsname.h> 7 7 #include <linux/version.h> 8 8 9 - #include "mana.h" 9 + #include <net/mana/mana.h> 10 10 11 11 static u32 mana_gd_r32(struct gdma_context *g, u64 offset) 12 12 {
+2 -2
drivers/net/ethernet/microsoft/mana/hw_channel.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 2 2 /* Copyright (c) 2021, Microsoft Corporation. */ 3 3 4 - #include "gdma.h" 5 - #include "hw_channel.h" 4 + #include <net/mana/gdma.h> 5 + #include <net/mana/hw_channel.h> 6 6 7 7 static int mana_hwc_get_msg_index(struct hw_channel_context *hwc, u16 *msg_id) 8 8 {
drivers/net/ethernet/microsoft/mana/hw_channel.h include/net/mana/hw_channel.h
drivers/net/ethernet/microsoft/mana/mana.h include/net/mana/mana.h
drivers/net/ethernet/microsoft/mana/mana_auxiliary.h include/net/mana/mana_auxiliary.h
+1 -1
drivers/net/ethernet/microsoft/mana/mana_bpf.c
··· 8 8 #include <linux/bpf_trace.h> 9 9 #include <net/xdp.h> 10 10 11 - #include "mana.h" 11 + #include <net/mana/mana.h> 12 12 13 13 void mana_xdp_tx(struct sk_buff *skb, struct net_device *ndev) 14 14 {
+2 -2
drivers/net/ethernet/microsoft/mana/mana_en.c
··· 12 12 #include <net/checksum.h> 13 13 #include <net/ip6_checksum.h> 14 14 15 - #include "mana.h" 16 - #include "mana_auxiliary.h" 15 + #include <net/mana/mana.h> 16 + #include <net/mana/mana_auxiliary.h> 17 17 18 18 static DEFINE_IDA(mana_adev_ida); 19 19
+1 -1
drivers/net/ethernet/microsoft/mana/mana_ethtool.c
··· 5 5 #include <linux/etherdevice.h> 6 6 #include <linux/ethtool.h> 7 7 8 - #include "mana.h" 8 + #include <net/mana/mana.h> 9 9 10 10 static const struct { 11 11 char name[ETH_GSTRING_LEN];
+1 -1
drivers/net/ethernet/microsoft/mana/shm_channel.c
··· 6 6 #include <linux/io.h> 7 7 #include <linux/mm.h> 8 8 9 - #include "shm_channel.h" 9 + #include <net/mana/shm_channel.h> 10 10 11 11 #define PAGE_FRAME_L48_WIDTH_BYTES 6 12 12 #define PAGE_FRAME_L48_WIDTH_BITS (PAGE_FRAME_L48_WIDTH_BYTES * 8)
drivers/net/ethernet/microsoft/mana/shm_channel.h include/net/mana/shm_channel.h