Skip to content

Commit 51ff1c1

Browse files
committed
Merge: net/i40e: Driver Update
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6939 JIRA: https://issues.redhat.com/browse/RHEL-83573 This MR updates the i40e driver to upstream kernel net-next. Tested: http://dashboard.lnst.anl.lab.eng.bos.redhat.com/pipeline/7026 Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6890 Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6509 Signed-off-by: Dennis Chen <dechen@redhat.com> Approved-by: Kamal Heib <kheib@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents 5e77754 + ed58f82 commit 51ff1c1

File tree

9 files changed

+12
-662
lines changed

9 files changed

+12
-662
lines changed

drivers/net/ethernet/intel/i40e/i40e.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,15 +1191,13 @@ int i40e_add_del_fdir(struct i40e_vsi *vsi,
11911191
struct i40e_fdir_filter *input, bool add);
11921192
void i40e_fdir_check_and_reenable(struct i40e_pf *pf);
11931193
u32 i40e_get_current_fd_count(struct i40e_pf *pf);
1194-
u32 i40e_get_cur_guaranteed_fd_count(struct i40e_pf *pf);
11951194
u32 i40e_get_current_atr_cnt(struct i40e_pf *pf);
11961195
u32 i40e_get_global_fd_count(struct i40e_pf *pf);
11971196
bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features);
11981197
void i40e_set_ethtool_ops(struct net_device *netdev);
11991198
struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
12001199
const u8 *macaddr, s16 vlan);
12011200
void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f);
1202-
void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan);
12031201
int i40e_sync_vsi_filters(struct i40e_vsi *vsi);
12041202
struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,
12051203
u16 uplink, u32 param1);
@@ -1315,7 +1313,6 @@ int i40e_update_adq_vsi_queues(struct i40e_vsi *vsi, int vsi_offset);
13151313
int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);
13161314
int i40e_get_partition_bw_setting(struct i40e_pf *pf);
13171315
int i40e_set_partition_bw_setting(struct i40e_pf *pf);
1318-
int i40e_commit_partition_bw_setting(struct i40e_pf *pf);
13191316
void i40e_print_link_message(struct i40e_vsi *vsi, bool isup);
13201317

13211318
void i40e_set_fec_in_flags(u8 fec_cfg, unsigned long *flags);

drivers/net/ethernet/intel/i40e/i40e_adminq.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,16 +1016,6 @@ i40e_asq_send_command_atomic_v2(struct i40e_hw *hw,
10161016
return status;
10171017
}
10181018

1019-
int
1020-
i40e_asq_send_command_v2(struct i40e_hw *hw, struct i40e_aq_desc *desc,
1021-
void *buff, /* can be NULL */ u16 buff_size,
1022-
struct i40e_asq_cmd_details *cmd_details,
1023-
enum i40e_admin_queue_err *aq_status)
1024-
{
1025-
return i40e_asq_send_command_atomic_v2(hw, desc, buff, buff_size,
1026-
cmd_details, true, aq_status);
1027-
}
1028-
10291019
/**
10301020
* i40e_fill_default_direct_cmd_desc - AQ descriptor helper function
10311021
* @desc: pointer to the temp descriptor (non DMA mem)

0 commit comments

Comments
 (0)