Skip to content

Commit 468d8b4

Browse files
dmertmananguy11
authored andcommitted
iidc/ice/irdma: Rename IDC header file
To prepare for the IDC upgrade to support different CORE PCI drivers, rename header file from iidc.h to iidc_rdma.h since this files functionality is specifically for RDMA support. Use net/dscp.h include in irdma osdep.h and DSCP_MAX type.h, instead of iidc header and define. Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Dave Ertman <david.m.ertman@intel.com> Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 0af2f6b commit 468d8b4

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11890,7 +11890,7 @@ F: Documentation/networking/device_drivers/ethernet/intel/
1189011890
F: drivers/net/ethernet/intel/
1189111891
F: drivers/net/ethernet/intel/*/
1189211892
F: include/linux/avf/virtchnl.h
11893-
F: include/linux/net/intel/iidc.h
11893+
F: include/linux/net/intel/*/
1189411894

1189511895
INTEL ETHERNET PROTOCOL DRIVER FOR RDMA
1189611896
M: Mustafa Ismail <mustafa.ismail@intel.com>

drivers/infiniband/hw/irdma/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/io-64-nonatomic-lo-hi.h>
3030
#endif
3131
#include <linux/auxiliary_bus.h>
32-
#include <linux/net/intel/iidc.h>
32+
#include <linux/net/intel/iidc_rdma.h>
3333
#include <rdma/ib_smi.h>
3434
#include <rdma/ib_verbs.h>
3535
#include <rdma/ib_pack.h>

drivers/infiniband/hw/irdma/osdep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <linux/pci.h>
77
#include <linux/bitfield.h>
8-
#include <linux/net/intel/iidc.h>
98
#include <rdma/ib_verbs.h>
9+
#include <net/dscp.h>
1010

1111
#define STATS_TIMER_DELAY 60000
1212

drivers/infiniband/hw/irdma/type.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ struct irdma_sc_vsi {
567567
u8 qos_rel_bw;
568568
u8 qos_prio_type;
569569
u8 stats_idx;
570-
u8 dscp_map[IIDC_MAX_DSCP_MAPPING];
570+
u8 dscp_map[DSCP_MAX];
571571
struct irdma_qos qos[IRDMA_MAX_USER_PRIORITY];
572572
u64 hw_stats_regs[IRDMA_HW_STAT_INDEX_MAX_GEN_1];
573573
bool dscp_mode:1;
@@ -695,7 +695,7 @@ struct irdma_l2params {
695695
u16 qs_handle_list[IRDMA_MAX_USER_PRIORITY];
696696
u16 mtu;
697697
u8 up2tc[IRDMA_MAX_USER_PRIORITY];
698-
u8 dscp_map[IIDC_MAX_DSCP_MAPPING];
698+
u8 dscp_map[DSCP_MAX];
699699
u8 num_tc;
700700
u8 vsi_rel_bw;
701701
u8 vsi_prio_type;

drivers/net/ethernet/intel/ice/ice_idc_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#ifndef _ICE_IDC_INT_H_
55
#define _ICE_IDC_INT_H_
66

7-
#include <linux/net/intel/iidc.h>
7+
#include <linux/net/intel/iidc_rdma.h>
88

99
struct ice_pf;
1010

include/linux/net/intel/iidc.h renamed to include/linux/net/intel/iidc_rdma.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/* Copyright (C) 2021, Intel Corporation. */
33

4-
#ifndef _IIDC_H_
5-
#define _IIDC_H_
4+
#ifndef _IIDC_RDMA_H_
5+
#define _IIDC_RDMA_H_
66

77
#include <linux/auxiliary_bus.h>
88
#include <linux/dcbnl.h>
@@ -106,4 +106,4 @@ struct iidc_auxiliary_drv {
106106
void (*event_handler)(struct ice_pf *pf, struct iidc_event *event);
107107
};
108108

109-
#endif /* _IIDC_H_*/
109+
#endif /* _IIDC_RDMA_H_*/

0 commit comments

Comments
 (0)