From: Chiqijun chiqijun@huawei.com

driver inclusion category: bugfix bugzilla: 4472

-----------------------------------------------------------------------

Semaphore, spin_lock, etc. in linux do not need to be deinitialized, remove these useless definitions. Directly use the linux interface, the driver no longer encapsulates functions.

Signed-off-by: Chiqijun chiqijun@huawei.com Reviewed-by: Zengweiliang zengweiliang.zengweiliang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- .../net/ethernet/huawei/hinic/hinic_api_cmd.c | 20 ++------------ drivers/net/ethernet/huawei/hinic/hinic_cfg.c | 13 ---------- .../net/ethernet/huawei/hinic/hinic_cmdq.c | 6 ----- .../net/ethernet/huawei/hinic/hinic_hwdev.c | 7 ++--- .../net/ethernet/huawei/hinic/hinic_hwif.c | 2 -- .../net/ethernet/huawei/hinic/hinic_mbox.c | 13 ---------- .../net/ethernet/huawei/hinic/hinic_mgmt.c | 11 -------- .../net/ethernet/huawei/hinic/hinic_nic_cfg.c | 3 --- drivers/net/ethernet/huawei/hinic/hinic_rx.c | 3 +-- drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +-- drivers/net/ethernet/huawei/hinic/hinic_wq.c | 2 -- .../ethernet/huawei/hinic/ossl_knl_linux.c | 22 ---------------- .../ethernet/huawei/hinic/ossl_knl_linux.h | 26 ------------------- 13 files changed, 7 insertions(+), 125 deletions(-)

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c b/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c index e611faa945b2..5a1e8655be38 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c @@ -971,15 +971,13 @@ static int api_chain_init(struct hinic_api_cmd_chain *chain, cell_ctxt_size = chain->num_cells * sizeof(*chain->cell_ctxt); if (!cell_ctxt_size) { sdk_err(dev, "Api chain cell size cannot be zero\n"); - err = -EINVAL; - goto alloc_cell_ctxt_err; + return -EINVAL; }

chain->cell_ctxt = kzalloc(cell_ctxt_size, GFP_KERNEL); if (!chain->cell_ctxt) { sdk_err(dev, "Failed to allocate cell contexts for a chain\n"); - err = -ENOMEM; - goto alloc_cell_ctxt_err; + return -ENOMEM; }

chain->wb_status = dma_zalloc_coherent(dev, @@ -1032,13 +1030,6 @@ static int api_chain_init(struct hinic_api_cmd_chain *chain, alloc_wb_status_err: kfree(chain->cell_ctxt);

-/*lint -save -e548*/ -alloc_cell_ctxt_err: - if (chain->chain_type == HINIC_API_CMD_WRITE_ASYNC_TO_MGMT_CPU) - spin_lock_deinit(&chain->async_lock); - else - sema_deinit(&chain->sem); -/*lint -restore*/ return err; }

@@ -1055,13 +1046,6 @@ static void api_chain_free(struct hinic_api_cmd_chain *chain) dma_free_coherent(dev, sizeof(*chain->wb_status), chain->wb_status, chain->wb_status_paddr); kfree(chain->cell_ctxt); - -/*lint -save -e548*/ - if (chain->chain_type == HINIC_API_CMD_WRITE_ASYNC_TO_MGMT_CPU) - spin_lock_deinit(&chain->async_lock); - else - sema_deinit(&chain->sem); -/*lint -restore*/ }

/** diff --git a/drivers/net/ethernet/huawei/hinic/hinic_cfg.c b/drivers/net/ethernet/huawei/hinic/hinic_cfg.c index 68149027e403..05f9a58d2ec9 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_cfg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_cfg.c @@ -1485,12 +1485,10 @@ int init_cfg_mgmt(struct hinic_hwdev *dev)

free_interrupt_mem: kfree(cfg_mgmt->irq_param_info.alloc_info); - mutex_deinit(&((cfg_mgmt->irq_param_info).irq_mutex)); cfg_mgmt->irq_param_info.alloc_info = NULL;

free_eq_mem: kfree(cfg_mgmt->eq_info.eq); - mutex_deinit(&cfg_mgmt->eq_info.eq_mutex); cfg_mgmt->eq_info.eq = NULL;

free_mgmt_mem: @@ -1524,11 +1522,9 @@ void free_cfg_mgmt(struct hinic_hwdev *dev)

kfree(cfg_mgmt->irq_param_info.alloc_info); cfg_mgmt->irq_param_info.alloc_info = NULL; - mutex_deinit(&((cfg_mgmt->irq_param_info).irq_mutex));

kfree(cfg_mgmt->eq_info.eq); cfg_mgmt->eq_info.eq = NULL; - mutex_deinit(&cfg_mgmt->eq_info.eq_mutex);

kfree(cfg_mgmt); } @@ -2141,16 +2137,11 @@ static int hinic_os_dep_init(struct hinic_hwdev *hwdev)

static void hinic_os_dep_deinit(struct hinic_hwdev *hwdev) { - destroy_work(&hwdev->fault_work); - destroy_workqueue(hwdev->workq);

down(&hwdev->fault_list_sem);

up(&hwdev->fault_list_sem); - - sema_deinit(&hwdev->fault_list_sem); - sema_deinit(&hwdev->recover_sem); }

void hinic_ppf_hwdev_unreg(void *hwdev) @@ -2335,8 +2326,6 @@ int hinic_init_hwdev(struct hinic_init_para *para) vfree(hwdev->chip_fault_stats);

alloc_chip_fault_stats_err: - sema_deinit(&hwdev->func_sem); - sema_deinit(&hwdev->ppf_sem); kfree(hwdev); *para->hwdev = NULL;

@@ -2406,8 +2395,6 @@ void hinic_free_hwdev(void *hwdev) clear_bit(HINIC_HWDEV_NONE_INITED, &dev->func_state); hinic_free_hwif(dev); vfree(dev->chip_fault_stats); - sema_deinit(&dev->func_sem); - sema_deinit(&dev->ppf_sem); kfree(dev); }

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c b/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c index 38b54860e4bc..d7802caca0a6 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c @@ -672,12 +672,10 @@ static int cmdq_sync_cmd_direct_resp(struct hinic_cmdq *cmdq, sdk_err(cmdq->hwdev->dev_hdl, "Cmdq sync command timeout, prod idx: 0x%x\n", curr_prod_idx); hinic_dump_ceq_info(cmdq->hwdev); - destroy_completion(&done); return -ETIMEDOUT; }

timeout_check_ok: - destroy_completion(&done); smp_rmb(); /* read error code after completion */

if (errcode > 1) @@ -803,12 +801,10 @@ static int cmdq_sync_cmd_detail_resp(struct hinic_cmdq *cmdq, sdk_err(cmdq->hwdev->dev_hdl, "Cmdq sync command timeout, prod idx: 0x%x\n", curr_prod_idx); hinic_dump_ceq_info(cmdq->hwdev); - destroy_completion(&done); return -ETIMEDOUT; }

timeout_check_ok: - destroy_completion(&done); smp_rmb(); /* read error code after completion */

if (errcode > 1) @@ -1354,7 +1350,6 @@ static int init_cmdq(struct hinic_cmdq *cmdq, struct hinic_hwdev *hwdev, kfree(cmdq->cmd_infos);

cmd_infos_err: - spin_lock_deinit(&cmdq->cmdq_lock);

return err; } @@ -1363,7 +1358,6 @@ static void free_cmdq(struct hinic_hwdev *hwdev, struct hinic_cmdq *cmdq) { hinic_free_db_addr(hwdev, cmdq->db_base, NULL); kfree(cmdq->cmd_infos); - spin_lock_deinit(&cmdq->cmdq_lock); }

int hinic_set_cmdq_ctxts(struct hinic_hwdev *hwdev) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c b/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c index 3ae6e215b907..1d56349c0c11 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c @@ -4677,7 +4677,6 @@ static void hinic_heartbeat_timer_handler(unsigned long data) if (__detect_heartbeat_ehd_lost(hwdev) || !hinic_get_heartbeat_status(hwdev)) { hwdev->heartbeat_lost = 1; - stop_timer(&hwdev->heartbeat_timer); queue_work(hwdev->workq, &hwdev->timer_work); } else { mod_timer(&hwdev->heartbeat_timer, @@ -4697,16 +4696,14 @@ void hinic_init_heartbeat(struct hinic_hwdev *hwdev) hwdev->heartbeat_timer.expires = jiffies + msecs_to_jiffies(HINIC_HEARTBEAT_START_EXPIRE);

- add_to_timer(&hwdev->heartbeat_timer, HINIC_HEARTBEAT_PERIOD); + add_timer(&hwdev->heartbeat_timer);

INIT_WORK(&hwdev->timer_work, hinic_heartbeat_event_handler); }

void hinic_destroy_heartbeat(struct hinic_hwdev *hwdev) { - destroy_work(&hwdev->timer_work); - stop_timer(&hwdev->heartbeat_timer); - delete_timer(&hwdev->heartbeat_timer); + del_timer_sync(&hwdev->heartbeat_timer); }

u8 hinic_nic_sw_aeqe_handler(void *handle, u8 event, u64 data) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hwif.c b/drivers/net/ethernet/huawei/hinic/hinic_hwif.c index b267084d3672..dcb7471227cf 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hwif.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_hwif.c @@ -622,7 +622,6 @@ int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base, return 0;

hwif_ready_err: - spin_lock_deinit(&hwif->free_db_area.idx_lock); kfree(hwif);

return err; @@ -634,7 +633,6 @@ int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base, */ void hinic_free_hwif(struct hinic_hwdev *hwdev) { - spin_lock_deinit(&hwdev->hwif->free_db_area.idx_lock); kfree(hwdev->hwif); }

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_mbox.c b/drivers/net/ethernet/huawei/hinic/hinic_mbox.c index add76893055d..bbc16cc38b33 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_mbox.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_mbox.c @@ -699,8 +699,6 @@ static void recv_func_mbox_work_handler(struct work_struct *work) recv_func_mbox_handler(mbox_work->func_to_func, mbox_work->recv_mbox, mbox_work->src_func_idx);

- destroy_work(&mbox_work->work); - kfree(mbox_work); }

@@ -840,8 +838,6 @@ static void update_random_id_work_handler(struct work_struct *work) sdk_warn(func_to_func->hwdev->dev_hdl, "Update vf id(0x%x) random id fail\n", mbox_work->src_func_idx);

- destroy_work(&mbox_work->work); - kfree(mbox_work); }

@@ -1087,10 +1083,8 @@ static int send_mbox_seg(struct hinic_mbox_func_to_func *func_to_func, if (!wait_for_completion_timeout(done, jif)) { sdk_err(hwdev->dev_hdl, "Send mailbox segment timeout\n"); dump_mox_reg(hwdev); - destroy_completion(done); return -ETIMEDOUT; } - destroy_completion(done);

wb_status = get_mbox_status(send_mbox); } @@ -1247,7 +1241,6 @@ int hinic_mbox_to_func(struct hinic_mbox_func_to_func *func_to_func, }

send_err: - destroy_completion(&mbox_for_resp->recv_done); up(&func_to_func->mbox_send_sem);

return err; @@ -1670,9 +1663,6 @@ int hinic_func_to_func_init(struct hinic_hwdev *hwdev) destroy_workqueue(func_to_func->workq);

create_mbox_workq_err: - spin_lock_deinit(&func_to_func->mbox_lock); - sema_deinit(&func_to_func->msg_send_sem); - sema_deinit(&func_to_func->mbox_send_sem); kfree(func_to_func);

return err; @@ -1690,9 +1680,6 @@ void hinic_func_to_func_free(struct hinic_hwdev *hwdev) free_mbox_wb_status(func_to_func); free_mbox_info(func_to_func->mbox_resp); free_mbox_info(func_to_func->mbox_send); - spin_lock_deinit(&func_to_func->mbox_lock); - sema_deinit(&func_to_func->mbox_send_sem); - sema_deinit(&func_to_func->msg_send_sem);

kfree(func_to_func); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c b/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c index ac9988710cad..510f5365baa7 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c @@ -461,7 +461,6 @@ int hinic_pf_to_mgmt_sync(void *hwdev, enum hinic_mod_type mod, u8 cmd, pf_to_mgmt_send_event_set(pf_to_mgmt, SEND_EVENT_END);

if (!(((struct hinic_hwdev *)hwdev)->chip_present_flag)) { - destroy_completion(recv_done); up(&pf_to_mgmt->sync_msg_lock); return -ETIMEDOUT; } @@ -481,7 +480,6 @@ int hinic_pf_to_mgmt_sync(void *hwdev, enum hinic_mod_type mod, u8 cmd, }

unlock_sync_msg: - destroy_completion(recv_done); up(&pf_to_mgmt->sync_msg_lock);

return err; @@ -1113,8 +1111,6 @@ static void recv_mgmt_msg_work_handler(struct work_struct *work) mgmt_work->msg_len, mgmt_work->msg_id, !mgmt_work->async_mgmt_to_pf);

- destroy_work(&mgmt_work->work); - kfree(mgmt_work->msg); kfree(mgmt_work); } @@ -1387,9 +1383,6 @@ int hinic_pf_to_mgmt_init(struct hinic_hwdev *hwdev) destroy_workqueue(pf_to_mgmt->workq);

create_mgmt_workq_err: - spin_lock_deinit(&pf_to_mgmt->sync_event_lock); - spin_lock_deinit(&pf_to_mgmt->async_msg_lock); - sema_deinit(&pf_to_mgmt->sync_msg_lock); kfree(pf_to_mgmt);

return err; @@ -1409,9 +1402,6 @@ void hinic_pf_to_mgmt_free(struct hinic_hwdev *hwdev) destroy_workqueue(pf_to_mgmt->workq); hinic_api_cmd_free(pf_to_mgmt->cmd_chain); free_msg_buf(pf_to_mgmt); - spin_lock_deinit(&pf_to_mgmt->sync_event_lock); - spin_lock_deinit(&pf_to_mgmt->async_msg_lock); - sema_deinit(&pf_to_mgmt->sync_msg_lock); kfree(pf_to_mgmt); }

@@ -1451,7 +1441,6 @@ void hinic_clp_pf_to_mgmt_free(struct hinic_hwdev *hwdev) { struct hinic_clp_pf_to_mgmt *clp_pf_to_mgmt = hwdev->clp_pf_to_mgmt;

- sema_deinit(&clp_pf_to_mgmt->clp_msg_lock); kfree(clp_pf_to_mgmt->clp_msg_buf); kfree(clp_pf_to_mgmt); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c index fb94588daa30..9acde2025cd6 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c @@ -2922,7 +2922,6 @@ int hinic_vf_func_init(struct hinic_hwdev *hwdev) kfree(nic_io->vf_infos);

out_free_nic_io: - sema_deinit(&hwdev->nic_io->nic_cfg.cfg_lock); kfree(hwdev->nic_io); hwdev->nic_io = NULL;

@@ -2950,8 +2949,6 @@ void hinic_vf_func_free(struct hinic_hwdev *hwdev) } }

- sema_deinit(&hwdev->nic_io->nic_cfg.cfg_lock); - kfree(hwdev->nic_io); hwdev->nic_io = NULL; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.c b/drivers/net/ethernet/huawei/hinic/hinic_rx.c index c8cbcdfd5883..977f816e7258 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_rx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.c @@ -67,8 +67,7 @@ static bool rx_alloc_mapped_page(struct hinic_rxq *rxq, return true;

/* alloc new page for storage */ - page = alloc_pages_node(NUMA_NO_NODE, GFP_ATOMIC | __GFP_COLD | - __GFP_COMP, nic_dev->page_order); + page = alloc_pages_node(NUMA_NO_NODE, GFP_ATOMIC, nic_dev->page_order); if (unlikely(!page)) { nicif_err(nic_dev, drv, netdev, "Alloc rxq: %d page failed\n", rxq->q_id); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c index 3d9d9d0d6d0c..be57be78feee 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c @@ -155,9 +155,9 @@ static int tx_map_skb(struct hinic_nic_dev *nic_dev, struct sk_buff *skb, frag = &skb_shinfo(skb)->frags[i - 1]; nsize = skb_frag_size(frag);

- vaddr = _kc_kmap_atomic(skb_frag_page(frag)); + vaddr = kmap_atomic(skb_frag_page(frag)); memcpy(cpy_buff, vaddr + frag->page_offset, nsize); - _kc_kunmap_atomic(vaddr); + kunmap_atomic(vaddr); cpy_buff += nsize; } } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_wq.c b/drivers/net/ethernet/huawei/hinic/hinic_wq.c index 4d8180c6b271..032b28332a65 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_wq.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_wq.c @@ -528,8 +528,6 @@ void hinic_wqs_free(struct hinic_wqs *wqs) { u32 page_idx;

- spin_lock_deinit(&wqs->alloc_blocks_lock); - for (page_idx = 0; page_idx < wqs->num_pages; page_idx++) wqs_free_page(wqs, page_idx);

diff --git a/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.c b/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.c index daed2eca32c1..1aa09e55c64e 100644 --- a/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.c +++ b/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.c @@ -13,30 +13,8 @@ * */

-#include <linux/pci_regs.h> - #include "ossl_knl_linux.h"

-void add_to_timer(struct timer_list *timer, long period) -{ - if (!timer) - return; - - add_timer(timer); -} - -void stop_timer(struct timer_list *timer) -{ -} - -void delete_timer(struct timer_list *timer) -{ - if (!timer) - return; - - del_timer_sync(timer); -} - int local_atoi(const char *name) { int val = 0; diff --git a/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h b/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h index dd5d0fc949d7..c15958aecd9a 100644 --- a/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h +++ b/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h @@ -29,14 +29,6 @@ #include <linux/udp.h> #include <linux/highmem.h>

-#ifndef __GFP_COLD -#define __GFP_COLD 0 -#endif - -#ifndef __GFP_COMP -#define __GFP_COMP 0 -#endif - #ifndef SUPPORTED_100000baseKR4_Full #define SUPPORTED_100000baseKR4_Full 0 #define ADVERTISED_100000baseKR4_Full 0 @@ -142,12 +134,6 @@

#define HAVE_NDO_SET_VF_TRUST

-/*****************************************************************************/ -#include <linux/kconfig.h> - -#define _kc_kmap_atomic(page) kmap_atomic(page) -#define _kc_kunmap_atomic(addr) kunmap_atomic(addr) - /*****************************************************************************/ #define HAVE_NAPI_GRO_FLUSH_OLD

@@ -208,13 +194,6 @@

#define HAVE_ENCAPSULATION_CSUM

-#define spin_lock_deinit(lock) - -#define destroy_work(work) -void add_to_timer(struct timer_list *timer, long period); -void stop_timer(struct timer_list *timer); -void delete_timer(struct timer_list *timer); - int local_atoi(const char *name);

#define nicif_err(priv, type, dev, fmt, args...) \ @@ -228,11 +207,6 @@ int local_atoi(const char *name); #define nicif_dbg(priv, type, dev, fmt, args...) \ netif_level(dbg, priv, type, dev, "[NIC]"fmt, ##args)

-#define destroy_completion(completion) -#define sema_deinit(lock) -#define mutex_deinit(lock) -#define rwlock_deinit(lock) - #define tasklet_state(tasklet) ((tasklet)->state)

#endif

From: Chiqijun chiqijun@huawei.com

driver inclusion category: bugfix bugzilla: 4472

-----------------------------------------------------------------------

Delete the old kernel version adaptation interface in netdev ops.

Signed-off-by: Chiqijun chiqijun@huawei.com Reviewed-by: Zengweiliang zengweiliang.zengweiliang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 8 - .../net/ethernet/huawei/hinic/hinic_main.c | 274 +----------------- .../net/ethernet/huawei/hinic/hinic_nic_cfg.c | 18 -- .../net/ethernet/huawei/hinic/hinic_nic_cfg.h | 2 - .../net/ethernet/huawei/hinic/hinic_nic_dev.h | 7 - .../net/ethernet/huawei/hinic/hinic_nictool.c | 3 - drivers/net/ethernet/huawei/hinic/hinic_rx.h | 5 +- .../net/ethernet/huawei/hinic/hinic_sriov.c | 27 +- .../net/ethernet/huawei/hinic/hinic_sriov.h | 14 - drivers/net/ethernet/huawei/hinic/hinic_tx.h | 4 - .../ethernet/huawei/hinic/ossl_knl_linux.h | 53 ---- 11 files changed, 7 insertions(+), 408 deletions(-)

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index 0c0189b63a0d..1a745cd38afd 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -1587,12 +1587,8 @@ static void hinic_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats, u64 *data) { struct hinic_nic_dev *nic_dev = netdev_priv(netdev); -#ifdef HAVE_NDO_GET_STATS64 struct rtnl_link_stats64 temp; const struct rtnl_link_stats64 *net_stats; -#else - const struct net_device_stats *net_stats; -#endif struct hinic_phy_port_stats *port_stats; struct hinic_nic_stats *nic_stats; struct hinic_vport_stats vport_stats = {0}; @@ -1600,11 +1596,7 @@ static void hinic_get_ethtool_stats(struct net_device *netdev, char *p; int err;

-#ifdef HAVE_NDO_GET_STATS64 net_stats = dev_get_stats(netdev, &temp); -#else - net_stats = dev_get_stats(netdev); -#endif for (j = 0; j < ARRAY_LEN(hinic_netdev_stats); j++, i++) { p = (char *)(net_stats) + hinic_netdev_stats[j].offset; data[i] = (hinic_netdev_stats[j].size == diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index d78a5e3678b1..7b9c38c4db93 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -180,7 +180,6 @@ enum hinic_rx_buff_len { #define HINIC_MODERATONE_DELAY HZ #define CONVERT_UNIT 1024

-#ifdef HAVE_MULTI_VLAN_OFFLOAD_EN int hinic_netdev_event(struct notifier_block *notifier, unsigned long event, void *ptr);

@@ -255,15 +254,7 @@ int hinic_netdev_event(struct notifier_block *notifier, if (vlan_depth == HINIC_MAX_VLAN_DEPTH_OFFLOAD_SUPPORT) { ndev->vlan_features &= (~HINIC_VLAN_CLEAR_OFFLOAD); } else if (vlan_depth > HINIC_MAX_VLAN_DEPTH_OFFLOAD_SUPPORT) { -#ifdef HAVE_NDO_SET_FEATURES -#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT - set_netdev_hw_features(ndev, - get_netdev_hw_features(ndev) & - (~HINIC_VLAN_CLEAR_OFFLOAD)); -#else ndev->hw_features &= (~HINIC_VLAN_CLEAR_OFFLOAD); -#endif -#endif ndev->features &= (~HINIC_VLAN_CLEAR_OFFLOAD); }

@@ -278,7 +269,6 @@ int hinic_netdev_event(struct notifier_block *notifier,

return NOTIFY_DONE; } -#endif

void hinic_link_status_change(struct hinic_nic_dev *nic_dev, bool status) { @@ -1172,24 +1162,9 @@ static u16 select_queue_by_toeplitz(struct net_device *dev, return (u16)nic_dev->rss_indir_user[hash & 0xFF]; }

-#if defined(HAVE_NDO_SELECT_QUEUE_ACCEL_FALLBACK) -#if defined(HAVE_NDO_SELECT_QUEUE_SB_DEV) static u16 hinic_select_queue(struct net_device *netdev, struct sk_buff *skb, struct net_device *sb_dev, select_queue_fallback_t fallback) -#else -static u16 hinic_select_queue(struct net_device *netdev, struct sk_buff *skb, - __always_unused void *accel, - select_queue_fallback_t fallback) -#endif - -#elif defined(HAVE_NDO_SELECT_QUEUE_ACCEL) -static u16 hinic_select_queue(struct net_device *netdev, struct sk_buff *skb, - __always_unused void *accel) - -#else -static u16 hinic_select_queue(struct net_device *netdev, struct sk_buff *skb) -#endif /* end of HAVE_NDO_SELECT_QUEUE_ACCEL_FALLBACK */ { struct hinic_nic_dev *nic_dev = netdev_priv(netdev);

@@ -1204,40 +1179,13 @@ static u16 hinic_select_queue(struct net_device *netdev, struct sk_buff *skb) netdev->real_num_tx_queues);

fallback: - -#ifndef HAVE_NDO_SELECT_QUEUE_ACCEL_FALLBACK - return skb_tx_hash(netdev, skb); -#else -#ifdef HAVE_NDO_SELECT_QUEUE_SB_DEV return fallback(netdev, skb, sb_dev); -#else - return fallback(netdev, skb); -#endif -#endif }

-#ifdef HAVE_NDO_GET_STATS64 -#ifdef HAVE_VOID_NDO_GET_STATS64 static void hinic_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) -#else -static struct rtnl_link_stats64 - *hinic_get_stats64(struct net_device *netdev, - struct rtnl_link_stats64 *stats) -#endif - -#else /* !HAVE_NDO_GET_STATS64 */ -static struct net_device_stats *hinic_get_stats(struct net_device *netdev) -#endif { struct hinic_nic_dev *nic_dev = netdev_priv(netdev); -#ifndef HAVE_NDO_GET_STATS64 -#ifdef HAVE_NETDEV_STATS_IN_NETDEV - struct net_device_stats *stats = &netdev->stats; -#else - struct net_device_stats *stats = &nic_dev->net_stats; -#endif /* HAVE_NETDEV_STATS_IN_NETDEV */ -#endif /* HAVE_NDO_GET_STATS64 */ struct hinic_txq_stats *txq_stats; struct hinic_rxq_stats *rxq_stats; struct hinic_txq *txq; @@ -1289,10 +1237,6 @@ static struct net_device_stats *hinic_get_stats(struct net_device *netdev) stats->rx_bytes = bytes; stats->rx_errors = errors; stats->rx_dropped = dropped; - -#ifndef HAVE_VOID_NDO_GET_STATS64 - return stats; -#endif }

static void hinic_tx_timeout(struct net_device *netdev) @@ -1495,12 +1439,8 @@ static int set_features(struct hinic_nic_dev *nic_dev, return err; }

-#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT -static int hinic_set_features(struct net_device *netdev, u32 features) -#else static int hinic_set_features(struct net_device *netdev, netdev_features_t features) -#endif { struct hinic_nic_dev *nic_dev = netdev_priv(netdev);

@@ -1508,12 +1448,8 @@ static int hinic_set_features(struct net_device *netdev, features, false); }

-#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT -static u32 hinic_fix_features(struct net_device *netdev, u32 features) -#else static netdev_features_t hinic_fix_features(struct net_device *netdev, netdev_features_t features) -#endif { /* If Rx checksum is disabled, then LRO should also be disabled */ if (!(features & NETIF_F_RXCSUM)) @@ -1577,52 +1513,23 @@ static int hinic_set_default_hw_feature(struct hinic_nic_dev *nic_dev) return set_features(nic_dev, 0, nic_dev->netdev->features, true); }

-#ifdef NETIF_F_HW_TC -#ifdef TC_MQPRIO_HW_OFFLOAD_MAX static int hinic_setup_tc_mqprio(struct net_device *dev, struct tc_mqprio_qopt *mqprio) { mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; return hinic_setup_tc(dev, mqprio->num_tc); } -#endif /* TC_MQPRIO_HW_OFFLOAD_MAX */

-#if defined(HAVE_NDO_SETUP_TC_REMOVE_TC_TO_NETDEV) static int __hinic_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data) -#elif defined(HAVE_NDO_SETUP_TC_CHAIN_INDEX) -static int __hinic_setup_tc(struct net_device *dev, __always_unused u32 handle, - u32 chain_index, __always_unused __be16 proto, - struct tc_to_netdev *tc) -#else -static int __hinic_setup_tc(struct net_device *dev, __always_unused u32 handle, - __always_unused __be16 proto, - struct tc_to_netdev *tc) -#endif { -#ifndef HAVE_NDO_SETUP_TC_REMOVE_TC_TO_NETDEV - unsigned int type = tc->type; - -#ifdef HAVE_NDO_SETUP_TC_CHAIN_INDEX - if (chain_index) - return -EOPNOTSUPP; - -#endif -#endif switch (type) { case TC_SETUP_QDISC_MQPRIO: -#if defined(HAVE_NDO_SETUP_TC_REMOVE_TC_TO_NETDEV) return hinic_setup_tc_mqprio(dev, type_data); -#elif defined(TC_MQPRIO_HW_OFFLOAD_MAX) - return hinic_setup_tc_mqprio(dev, tc->mqprio); -#else - return hinic_setup_tc(dev, tc->tc); -#endif default: return -EOPNOTSUPP; } } -#endif /* NETIF_F_HW_TC */

#ifdef CONFIG_NET_POLL_CONTROLLER static void hinic_netpoll(struct net_device *netdev) @@ -1974,43 +1881,6 @@ static void hinic_update_mac_filter(struct hinic_nic_dev *nic_dev, } }

-#ifndef NETDEV_HW_ADDR_T_MULTICAST -static void hinic_update_mc_filter(struct hinic_nic_dev *nic_dev, - struct list_head *filter_list) -{ - struct dev_mc_list *ha; - struct hinic_mac_filter *f, *ftmp, *filter; - - /* add addr if not already in the filter list */ - netif_addr_lock_bh(nic_dev->netdev); - netdev_for_each_mc_addr(ha, nic_dev->netdev) { - filter = hinic_find_mac(filter_list, ha->da_addr); - if (!filter) - hinic_add_filter(nic_dev, filter_list, ha->da_addr); - else if (filter->state == HINIC_MAC_WAIT_HW_UNSYNC) - filter->state = HINIC_MAC_HW_SYNCED; - } - netif_addr_unlock_bh(nic_dev->netdev); - /* delete addr if not in netdev list */ - list_for_each_entry_safe(f, ftmp, filter_list, list) { - bool found = false; - - netif_addr_lock_bh(nic_dev->netdev); - netdev_for_each_mc_addr(ha, nic_dev->netdev) - if (ether_addr_equal(ha->da_addr, f->addr)) { - found = true; - break; - } - netif_addr_unlock_bh(nic_dev->netdev); - - if (found) - continue; - - hinic_del_filter(nic_dev, f); - } -} -#endif - static void __update_mac_filter(struct hinic_nic_dev *nic_dev) { struct net_device *netdev = nic_dev->netdev; @@ -2018,12 +1888,8 @@ static void __update_mac_filter(struct hinic_nic_dev *nic_dev) if (test_and_clear_bit(HINIC_UPDATE_MAC_FILTER, &nic_dev->flags)) { hinic_update_mac_filter(nic_dev, &netdev->uc, &nic_dev->uc_filter_list); -#ifdef NETDEV_HW_ADDR_T_MULTICAST hinic_update_mac_filter(nic_dev, &netdev->mc, &nic_dev->mc_filter_list); -#else - hinic_update_mc_filter(nic_dev, &nic_dev->mc_filter_list); -#endif } }

@@ -2104,124 +1970,44 @@ static const struct net_device_ops hinic_netdev_ops = { .ndo_open = hinic_open, .ndo_stop = hinic_close, .ndo_start_xmit = hinic_xmit_frame, - -#ifdef HAVE_NDO_GET_STATS64 .ndo_get_stats64 = hinic_get_stats64, -#else - .ndo_get_stats = hinic_get_stats, -#endif /* HAVE_NDO_GET_STATS64 */ - .ndo_tx_timeout = hinic_tx_timeout, .ndo_select_queue = hinic_select_queue, -#ifdef HAVE_RHEL7_NETDEV_OPS_EXT_NDO_CHANGE_MTU - .extended.ndo_change_mtu = hinic_change_mtu, -#else .ndo_change_mtu = hinic_change_mtu, -#endif .ndo_set_mac_address = hinic_set_mac_addr, .ndo_validate_addr = eth_validate_addr, #if defined(NETIF_F_HW_VLAN_TX) || defined(NETIF_F_HW_VLAN_CTAG_TX) .ndo_vlan_rx_add_vid = hinic_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = hinic_vlan_rx_kill_vid, #endif -#ifdef HAVE_RHEL7_NET_DEVICE_OPS_EXT - /* RHEL7 requires this to be defined to enable extended ops. RHEL7 - * uses the function get_ndo_ext to retrieve offsets for extended - * fields from with the net_device_ops struct and ndo_size is checked - * to determine whether or not the offset is valid. - */ - .ndo_size = sizeof(const struct net_device_ops), -#endif -#ifdef IFLA_VF_MAX + .ndo_set_vf_mac = hinic_ndo_set_vf_mac, -#ifdef HAVE_RHEL7_NETDEV_OPS_EXT_NDO_SET_VF_VLAN - .extended.ndo_set_vf_vlan = hinic_ndo_set_vf_vlan, -#else .ndo_set_vf_vlan = hinic_ndo_set_vf_vlan, -#endif -#ifdef HAVE_NDO_SET_VF_MIN_MAX_TX_RATE .ndo_set_vf_rate = hinic_ndo_set_vf_bw, -#else - .ndo_set_vf_tx_rate = hinic_ndo_set_vf_bw, -#endif /* HAVE_NDO_SET_VF_MIN_MAX_TX_RATE */ -#ifdef HAVE_VF_SPOOFCHK_CONFIGURE .ndo_set_vf_spoofchk = hinic_ndo_set_vf_spoofchk, -#endif -#ifdef HAVE_NDO_SET_VF_TRUST -#ifdef HAVE_RHEL7_NET_DEVICE_OPS_EXT - .extended.ndo_set_vf_trust = hinic_ndo_set_vf_trust, -#else .ndo_set_vf_trust = hinic_ndo_set_vf_trust, -#endif /* HAVE_RHEL7_NET_DEVICE_OPS_EXT */ -#endif /* HAVE_NDO_SET_VF_TRUST */ - .ndo_get_vf_config = hinic_ndo_get_vf_config, -#endif

-#ifdef HAVE_RHEL7_NETDEV_OPS_EXT_NDO_SETUP_TC - .extended.ndo_setup_tc_rh = __hinic_setup_tc, -#else -#ifdef HAVE_SETUP_TC -#ifdef NETIF_F_HW_TC .ndo_setup_tc = __hinic_setup_tc, -#else - .ndo_setup_tc = hinic_setup_tc, -#endif /* NETIF_F_HW_TC */ -#endif /* HAVE_SETUP_TC */ -#endif

#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = hinic_netpoll, #endif /* CONFIG_NET_POLL_CONTROLLER */

.ndo_set_rx_mode = hinic_nic_set_rx_mode, - -#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT -}; - -/* RHEL6 keeps these operations in a separate structure */ -static const struct net_device_ops_ext hinic_netdev_ops_ext = { - .size = sizeof(struct net_device_ops_ext), -#endif /* HAVE_RHEL6_NET_DEVICE_OPS_EXT */ - -#ifdef HAVE_NDO_SET_VF_LINK_STATE .ndo_set_vf_link_state = hinic_ndo_set_vf_link_state, -#endif - -#ifdef HAVE_NDO_SET_FEATURES .ndo_fix_features = hinic_fix_features, .ndo_set_features = hinic_set_features, -#endif /* HAVE_NDO_SET_FEATURES */ };

static const struct net_device_ops hinicvf_netdev_ops = { .ndo_open = hinic_open, .ndo_stop = hinic_close, .ndo_start_xmit = hinic_xmit_frame, - -#ifdef HAVE_NDO_GET_STATS64 .ndo_get_stats64 = hinic_get_stats64, -#else - .ndo_get_stats = hinic_get_stats, -#endif /* HAVE_NDO_GET_STATS64 */ - .ndo_tx_timeout = hinic_tx_timeout, .ndo_select_queue = hinic_select_queue, - -#ifdef HAVE_RHEL7_NET_DEVICE_OPS_EXT - /* RHEL7 requires this to be defined to enable extended ops. RHEL7 - * uses the function get_ndo_ext to retrieve offsets for extended - * fields from with the net_device_ops struct and ndo_size is checked - * to determine whether or not the offset is valid. - */ - .ndo_size = sizeof(const struct net_device_ops), -#endif - -#ifdef HAVE_RHEL7_NETDEV_OPS_EXT_NDO_CHANGE_MTU - .extended.ndo_change_mtu = hinic_change_mtu, -#else .ndo_change_mtu = hinic_change_mtu, -#endif .ndo_set_mac_address = hinic_set_mac_addr, .ndo_validate_addr = eth_validate_addr, #if defined(NETIF_F_HW_VLAN_TX) || defined(NETIF_F_HW_VLAN_CTAG_TX) @@ -2235,31 +2021,14 @@ static const struct net_device_ops hinicvf_netdev_ops = {

.ndo_set_rx_mode = hinic_nic_set_rx_mode,

-#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT -}; - -/* RHEL6 keeps these operations in a separate structure */ -static const struct net_device_ops_ext hinicvf_netdev_ops_ext = { - .size = sizeof(struct net_device_ops_ext), -#endif /* HAVE_RHEL6_NET_DEVICE_OPS_EXT */ - -#ifdef HAVE_NDO_SET_FEATURES .ndo_fix_features = hinic_fix_features, .ndo_set_features = hinic_set_features, -#endif /* HAVE_NDO_SET_FEATURES */ };

static void netdev_feature_init(struct net_device *netdev) { struct hinic_nic_dev *nic_dev = netdev_priv(netdev); - -#ifdef HAVE_NDO_SET_FEATURES -#ifndef HAVE_RHEL6_NET_DEVICE_OPS_EXT netdev_features_t hw_features; -#else - u32 hw_features; -#endif -#endif

netdev->features = NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | @@ -2271,12 +2040,9 @@ static void netdev_feature_init(struct net_device *netdev)

netdev->vlan_features = netdev->features;

- if (FUNC_SUPPORT_ENCAP_TSO_CSUM(nic_dev->hwdev)) { -#ifdef HAVE_ENCAPSULATION_TSO + if (FUNC_SUPPORT_ENCAP_TSO_CSUM(nic_dev->hwdev)) netdev->features |= NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_UDP_TUNNEL_CSUM; -#endif /* HAVE_ENCAPSULATION_TSO */ - }

if (FUNC_SUPPORT_HW_VLAN(nic_dev->hwdev)) { #if defined(NETIF_F_HW_VLAN_CTAG_TX) @@ -2292,15 +2058,10 @@ static void netdev_feature_init(struct net_device *netdev) #endif }

-#ifdef HAVE_NDO_SET_FEATURES /* copy netdev features into list of user selectable features */ -#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT - hw_features = get_netdev_hw_features(netdev); -#else hw_features = netdev->hw_features; -#endif hw_features |= netdev->features; -#endif + if (FUNC_SUPPORT_LRO(nic_dev->hwdev)) { /* LRO is disable in default, only set hw features */ hw_features |= NETIF_F_LRO; @@ -2311,13 +2072,7 @@ static void netdev_feature_init(struct net_device *netdev) netdev->features |= NETIF_F_LRO; }

-#ifdef HAVE_NDO_SET_FEATURES -#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT - set_netdev_hw_features(netdev, hw_features); -#else netdev->hw_features = hw_features; -#endif -#endif

/* Set after hw_features because this could not be part of hw_features */ #if defined(NETIF_F_HW_VLAN_CTAG_FILTER) @@ -2331,16 +2086,12 @@ static void netdev_feature_init(struct net_device *netdev) #endif

if (FUNC_SUPPORT_ENCAP_TSO_CSUM(nic_dev->hwdev)) { -#ifdef HAVE_ENCAPSULATION_CSUM netdev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SCTP_CRC | NETIF_F_SG; -#ifdef HAVE_ENCAPSULATION_TSO netdev->hw_enc_features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN | NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_UDP_TUNNEL; -#endif /* HAVE_ENCAPSULATION_TSO */ -#endif /* HAVE_ENCAPSULATION_CSUM */ } }

@@ -2486,15 +2237,9 @@ static int hinic_sw_init(struct hinic_nic_dev *adapter) }

/* MTU range: 256 - 9600 */ -#ifdef HAVE_NETDEVICE_MIN_MAX_MTU netdev->min_mtu = HINIC_MIN_MTU_SIZE; netdev->max_mtu = HINIC_MAX_JUMBO_FRAME_SIZE; -#endif

-#ifdef HAVE_NETDEVICE_EXTENDED_MIN_MAX_MTU - netdev->extended->min_mtu = HINIC_MIN_MTU_SIZE; - netdev->extended->max_mtu = HINIC_MAX_JUMBO_FRAME_SIZE; -#endif return 0;

set_mac_err: @@ -2511,17 +2256,11 @@ static void hinic_assign_netdev_ops(struct hinic_nic_dev *adapter) { if (!HINIC_FUNC_IS_VF(adapter->hwdev)) { adapter->netdev->netdev_ops = &hinic_netdev_ops; -#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT - set_netdev_ops_ext(adapter->netdev, &hinic_netdev_ops_ext); -#endif /* HAVE_RHEL6_NET_DEVICE_OPS_EXT */ if (FUNC_SUPPORT_DCB(adapter->hwdev)) adapter->netdev->dcbnl_ops = &hinic_dcbnl_ops; hinic_set_ethtool_ops(adapter->netdev); } else { adapter->netdev->netdev_ops = &hinicvf_netdev_ops; -#ifdef HAVE_RHEL6_NET_DEVICE_OPS_EXT - set_netdev_ops_ext(adapter->netdev, &hinicvf_netdev_ops_ext); -#endif /* HAVE_RHEL6_NET_DEVICE_OPS_EXT */ hinicvf_set_ethtool_ops(adapter->netdev); } adapter->netdev->watchdog_timeo = 5 * HZ; @@ -3025,9 +2764,8 @@ static int nic_probe(struct hinic_lld_dev *lld_dev, void **uld_dev, if (err) goto set_features_err;

-#ifdef HAVE_MULTI_VLAN_OFFLOAD_EN hinic_register_notifier(nic_dev); -#endif + err = register_netdev(netdev); if (err) { nic_err(&pdev->dev, "Failed to register netdev\n"); @@ -3043,9 +2781,7 @@ static int nic_probe(struct hinic_lld_dev *lld_dev, void **uld_dev, return 0;

netdev_err: -#ifdef HAVE_MULTI_VLAN_OFFLOAD_EN hinic_unregister_notifier(nic_dev); -#endif

set_features_err: destroy_workqueue(nic_dev->workq); @@ -3083,10 +2819,8 @@ static void nic_remove(struct hinic_lld_dev *lld_dev, void *adapter) netdev = nic_dev->netdev;

unregister_netdev(netdev); -#ifdef HAVE_MULTI_VLAN_OFFLOAD_EN hinic_unregister_notifier(nic_dev);

-#endif cancel_work_sync(&nic_dev->rx_mode_work); destroy_workqueue(nic_dev->workq);

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c index 9acde2025cd6..5cdcc3ec16c0 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c @@ -3056,30 +3056,18 @@ void hinic_get_vf_config(void *hwdev, u16 vf_id, struct ifla_vf_info *ivi) memcpy(ivi->mac, vfinfo->vf_mac_addr, ETH_ALEN); ivi->vlan = vfinfo->pf_vlan; ivi->qos = vfinfo->pf_qos; - -#ifdef HAVE_VF_SPOOFCHK_CONFIGURE ivi->spoofchk = vfinfo->spoofchk; -#endif - -#ifdef HAVE_NDO_SET_VF_TRUST ivi->trusted = vfinfo->trust; -#endif

-#ifdef HAVE_NDO_SET_VF_MIN_MAX_TX_RATE ivi->max_tx_rate = vfinfo->max_rate; ivi->min_tx_rate = vfinfo->min_rate; -#else - ivi->tx_rate = vfinfo->max_rate; -#endif /* HAVE_NDO_SET_VF_MIN_MAX_TX_RATE */

-#ifdef HAVE_NDO_SET_VF_LINK_STATE if (!vfinfo->link_forced) ivi->linkstate = IFLA_VF_LINK_STATE_AUTO; else if (vfinfo->link_up) ivi->linkstate = IFLA_VF_LINK_STATE_ENABLE; else ivi->linkstate = IFLA_VF_LINK_STATE_DISABLE; -#endif }

void hinic_clear_vf_infos(void *hwdev, u16 vf_id) @@ -3102,10 +3090,8 @@ void hinic_clear_vf_infos(void *hwdev, u16 vf_id) if (vf_infos->spoofchk) hinic_set_vf_spoofchk(hwdev, vf_id, false);

-#ifdef HAVE_NDO_SET_VF_TRUST if (vf_infos->trust) hinic_set_vf_trust(hwdev, vf_id, false); -#endif

memset(vf_infos, 0, sizeof(*vf_infos)); /* set vf_infos to default */ @@ -3225,7 +3211,6 @@ int hinic_set_vf_spoofchk(void *hwdev, u16 vf_id, bool spoofchk) return err; }

-#ifdef HAVE_NDO_SET_VF_TRUST int hinic_set_vf_trust(void *hwdev, u16 vf_id, bool trust) { struct hinic_hwdev *hw_dev = hwdev; @@ -3241,7 +3226,6 @@ int hinic_set_vf_trust(void *hwdev, u16 vf_id, bool trust)

return 0; } -#endif

bool hinic_vf_info_spoofchk(void *hwdev, int vf_id) { @@ -3251,7 +3235,6 @@ bool hinic_vf_info_spoofchk(void *hwdev, int vf_id) return spoofchk; }

-#ifdef HAVE_NDO_SET_VF_TRUST bool hinic_vf_info_trust(void *hwdev, int vf_id) { struct hinic_nic_io *nic_io = ((struct hinic_hwdev *)hwdev)->nic_io; @@ -3259,7 +3242,6 @@ bool hinic_vf_info_trust(void *hwdev, int vf_id)

return trust; } -#endif

static int hinic_set_vf_rate_limit(void *hwdev, u16 vf_id, u32 tx_rate) { diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.h b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.h index 3d98c5a7246c..89b324912879 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.h @@ -596,10 +596,8 @@ int hinic_set_vf_spoofchk(void *hwdev, u16 vf_id, bool spoofchk);

bool hinic_vf_info_spoofchk(void *hwdev, int vf_id);

-#ifdef HAVE_NDO_SET_VF_TRUST int hinic_set_vf_trust(void *hwdev, u16 vf_id, bool trust); bool hinic_vf_info_trust(void *hwdev, int vf_id); -#endif

int hinic_set_vf_tx_rate(void *hwdev, u16 vf_id, u32 max_rate, u32 min_rate);

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_dev.h b/drivers/net/ethernet/huawei/hinic/hinic_nic_dev.h index 1e050c3f8c0a..0af97bb34d7a 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_dev.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_dev.h @@ -149,11 +149,7 @@ struct hinic_nic_stats { u64 tx_carrier_off_drop; u64 tx_invalid_qid;

-#ifdef HAVE_NDO_GET_STATS64 struct u64_stats_sync syncp; -#else - struct u64_stats_sync_empty syncp; -#endif };

struct hinic_nic_dev { @@ -236,9 +232,6 @@ struct hinic_nic_dev { bool in_vm; bool is_vm_slave; int is_bm_slave; -#ifndef HAVE_NETDEV_STATS_IN_NETDEV - struct net_device_stats net_stats; -#endif struct hinic_nic_stats stats; /* lock for nic resource */ struct mutex nic_mutex; diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c index df01088a02f8..62b1535fe8af 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c @@ -363,9 +363,6 @@ static int clear_func_static(struct hinic_nic_dev *nic_dev, void *buf_in, int i;

*out_size = 0; -#ifndef HAVE_NETDEV_STATS_IN_NETDEV - memset(&nic_dev->net_stats, 0, sizeof(nic_dev->net_stats)); -#endif clean_nicdev_stats(nic_dev); for (i = 0; i < nic_dev->max_qps; i++) { hinic_rxq_clean_stats(&nic_dev->rxqs[i].rxq_stats); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.h b/drivers/net/ethernet/huawei/hinic/hinic_rx.h index 9b4abfe183d4..59500b2762c1 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_rx.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.h @@ -49,11 +49,8 @@ struct hinic_rxq_stats { u64 dropped;

u64 alloc_skb_err; -#ifdef HAVE_NDO_GET_STATS64 + struct u64_stats_sync syncp; -#else - struct u64_stats_sync_empty syncp; -#endif };

struct hinic_rx_info { diff --git a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c index 73ab2d716739..68a397ae73bf 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c @@ -265,7 +265,6 @@ int hinic_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) }

/*lint -save -e574 -e734*/ -#ifdef IFLA_VF_MAX static int set_hw_vf_vlan(struct hinic_sriov_info *sriov_info, u16 cur_vlanprio, int vf, u16 vlan, u8 qos) { @@ -302,12 +301,8 @@ static int set_hw_vf_vlan(struct hinic_sriov_info *sriov_info, OS_VF_ID_TO_HW(vf)); }

-#ifdef IFLA_VF_VLAN_INFO_MAX int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos, __be16 vlan_proto) -#else -int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) -#endif { struct hinic_nic_dev *adapter = netdev_priv(netdev); struct hinic_sriov_info *sriov_info; @@ -322,10 +317,10 @@ int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) sriov_info = hinic_get_sriov_info_by_pcidev(adapter->pdev); if (vf >= sriov_info->num_vfs || vlan > 4095 || qos > 7) return -EINVAL; -#ifdef IFLA_VF_VLAN_INFO_MAX + if (vlan_proto != htons(ETH_P_8021Q)) return -EPROTONOSUPPORT; -#endif + vlanprio = vlan | qos << HINIC_VLAN_PRIORITY_SHIFT; cur_vlanprio = hinic_vf_info_vlanprio(sriov_info->hwdev, OS_VF_ID_TO_HW(vf)); @@ -335,9 +330,7 @@ int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)

return set_hw_vf_vlan(sriov_info, cur_vlanprio, vf, vlan, qos); } -#endif

-#ifdef HAVE_VF_SPOOFCHK_CONFIGURE int hinic_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting) { struct hinic_nic_dev *adapter = netdev_priv(netdev); @@ -369,9 +362,7 @@ int hinic_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting)

return err; } -#endif

-#ifdef HAVE_NDO_SET_VF_TRUST int hinic_ndo_set_vf_trust(struct net_device *netdev, int vf, bool setting) { struct hinic_nic_dev *adapter = netdev_priv(netdev); @@ -400,7 +391,6 @@ int hinic_ndo_set_vf_trust(struct net_device *netdev, int vf, bool setting)

return err; } -#endif

int hinic_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi) @@ -458,19 +448,12 @@ int hinic_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)

#define HINIC_TX_RATE_TABLE_FULL 12

-#ifdef HAVE_NDO_SET_VF_MIN_MAX_TX_RATE int hinic_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate, int max_tx_rate) -#else -int hinic_ndo_set_vf_bw(struct net_device *netdev, int vf, int max_tx_rate) -#endif /* HAVE_NDO_SET_VF_MIN_MAX_TX_RATE */ { struct hinic_nic_dev *adapter = netdev_priv(netdev); struct nic_port_info port_info = {0}; struct hinic_sriov_info *sriov_info; -#ifndef HAVE_NDO_SET_VF_MIN_MAX_TX_RATE - int min_tx_rate = 0; -#endif u8 link_status = 0; u32 speeds[] = {SPEED_10, SPEED_100, SPEED_1000, SPEED_10000, SPEED_25000, SPEED_40000, SPEED_100000}; @@ -532,15 +515,9 @@ int hinic_ndo_set_vf_bw(struct net_device *netdev, int vf, int max_tx_rate) return -EIO; }

-#ifdef HAVE_NDO_SET_VF_MIN_MAX_TX_RATE nicif_info(adapter, drv, netdev, "Set VF %d max tx rate %d min tx rate %d successfully\n", vf, max_tx_rate, min_tx_rate); -#else - nicif_info(adapter, drv, netdev, - "Set VF %d tx rate %d successfully\n", - vf, max_tx_rate); -#endif

return 0; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_sriov.h b/drivers/net/ethernet/huawei/hinic/hinic_sriov.h index a1188fd40992..b2aded0190d0 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_sriov.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_sriov.h @@ -43,33 +43,19 @@ struct hinic_sriov_info { int hinic_pci_sriov_disable(struct pci_dev *dev); int hinic_pci_sriov_enable(struct pci_dev *dev, int num_vfs); int hinic_pci_sriov_configure(struct pci_dev *dev, int num_vfs); -#ifdef IFLA_VF_MAX int hinic_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac); -#ifdef IFLA_VF_VLAN_INFO_MAX int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos, __be16 vlan_proto); -#else -int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos); -#endif

int hinic_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi);

-#ifdef HAVE_VF_SPOOFCHK_CONFIGURE int hinic_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting); -#endif

-#ifdef HAVE_NDO_SET_VF_TRUST int hinic_ndo_set_vf_trust(struct net_device *netdev, int vf, bool setting); -#endif

int hinic_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link);

-#ifdef HAVE_NDO_SET_VF_MIN_MAX_TX_RATE int hinic_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate, int max_tx_rate); -#else -int hinic_ndo_set_vf_bw(struct net_device *netdev, int vf, int max_tx_rate); -#endif /* HAVE_NDO_SET_VF_MIN_MAX_TX_RATE */ -#endif #endif diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.h b/drivers/net/ethernet/huawei/hinic/hinic_tx.h index cfbd4deb5b0b..8d95019528f9 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_tx.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.h @@ -44,11 +44,7 @@ struct hinic_txq_stats { u64 map_frag_err; u64 frag_size_err;

-#ifdef HAVE_NDO_GET_STATS64 struct u64_stats_sync syncp; -#else - struct u64_stats_sync_empty syncp; -#endif };

struct hinic_dma_len { diff --git a/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h b/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h index 558ed4d9c17a..062f4f67a819 100644 --- a/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h +++ b/drivers/net/ethernet/huawei/hinic/ossl_knl_linux.h @@ -99,7 +99,6 @@

/*****************************************************************************/ #define ETH_TYPE_TRANS_SETS_DEV -#define HAVE_NETDEV_STATS_IN_NETDEV

/*****************************************************************************/

@@ -108,28 +107,6 @@ (RHEL_RELEASE_VERSION(7, 0) > RHEL_RELEASE_CODE)) #define HAVE_RHEL6_NET_DEVICE_EXTENDED #endif /* RHEL >= 6.2 && RHEL < 7.0 */ -#if (RHEL_RELEASE_CODE && \ - (RHEL_RELEASE_VERSION(6, 6) <= RHEL_RELEASE_CODE) && \ - (RHEL_RELEASE_VERSION(7, 0) > RHEL_RELEASE_CODE)) -#define HAVE_RHEL6_NET_DEVICE_OPS_EXT -#define HAVE_NDO_SET_FEATURES -#endif /* RHEL >= 6.6 && RHEL < 7.0 */ - -#define HAVE_NDO_GET_STATS64 - -/*****************************************************************************/ -#ifndef HAVE_SETUP_TC -#define HAVE_SETUP_TC -#endif - -#ifndef HAVE_NDO_SET_FEATURES -#define HAVE_NDO_SET_FEATURES -#endif - -/*****************************************************************************/ -#define HAVE_VF_SPOOFCHK_CONFIGURE - -#define HAVE_NDO_SET_VF_TRUST

/*****************************************************************************/ #define HAVE_NAPI_GRO_FLUSH_OLD @@ -139,42 +116,16 @@ #define HAVE_SRIOV_CONFIGURE #endif

-/*****************************************************************************/ -#define HAVE_NDO_SET_VF_LINK_STATE - /*****************************************************************************/ #define HAVE_NDO_SELECT_QUEUE_ACCEL

-#define HAVE_NDO_SELECT_QUEUE_ACCEL_FALLBACK - -/*****************************************************************************/ -#define HAVE_NDO_SET_VF_MIN_MAX_TX_RATE - /*****************************************************************************/ #define HAVE_SKBUFF_CSUM_LEVEL -#define HAVE_MULTI_VLAN_OFFLOAD_EN - -/*****************************************************************************/ -#define HAVE_NETDEVICE_MIN_MAX_MTU - -/*****************************************************************************/ -#define HAVE_VOID_NDO_GET_STATS64 - -/*****************************************************************************/ -#define HAVE_NDO_SETUP_TC_CHAIN_INDEX - -/*****************************************************************************/ -#define HAVE_NDO_SETUP_TC_REMOVE_TC_TO_NETDEV -/*****************************************************************************/

/*****************************************************************************/ #define HAVE_TIMER_SETUP /*****************************************************************************/

-/*****************************************************************************/ -#define HAVE_NDO_SELECT_QUEUE_SB_DEV -/*****************************************************************************/ - /* vxlan outer udp checksum will offload and skb->inner_transport_header * is wrong */ @@ -184,10 +135,6 @@ #define HAVE_OUTER_IPV6_TUNNEL_OFFLOAD #endif

-#define HAVE_ENCAPSULATION_TSO - -#define HAVE_ENCAPSULATION_CSUM - int local_atoi(const char *name);

#define nicif_err(priv, type, dev, fmt, args...) \

From: Chiqijun chiqijun@huawei.com

driver inclusion category: bugfix bugzilla: 4472

-----------------------------------------------------------------------

Delete unused UFO codes.

Signed-off-by: Chiqijun chiqijun@huawei.com Reviewed-by: Zengweiliang zengweiliang.zengweiliang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/huawei/hinic/hinic_tx.c | 157 ------------------- 1 file changed, 157 deletions(-)

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c index c60b3326708b..b242b7ddde04 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c @@ -482,11 +482,6 @@ static int hinic_tso(struct hinic_sq_task *task, u32 *queue_info,

if (l4_proto == IPPROTO_TCP) l4.tcp->check = ~csum_magic(&ip, IPPROTO_TCP); -#ifdef HAVE_IP6_FRAG_ID_ENABLE_UFO - else if (l4_proto == IPPROTO_UDP && ip.v4->version == 6) - ip_identify = be32_to_cpu(skb_shinfo(skb)->ip6_frag_id); - /* changed to big endiant is just to keep the same code style here */ -#endif

get_inner_l4_info(skb, &l4, TX_OFFLOAD_TSO, l4_proto, &l4_offload, &l4_len, &offset); @@ -615,119 +610,6 @@ static void *__try_to_get_wqe(struct net_device *netdev, u16 q_id, return wqe; }

-#ifdef HAVE_IP6_FRAG_ID_ENABLE_UFO -static int hinic_ufo_avoidance(struct sk_buff *skb, struct sk_buff **ufo_skb, - struct net_device *netdev, struct hinic_txq *txq) -{ - __be32 ip6_frag_id = skb_shinfo(skb)->ip6_frag_id; - u16 gso_size = skb_shinfo(skb)->gso_size; - struct frag_hdr ipv6_fhdr = {0}; - union hinic_ip ip; - u32 l2_l3_hlen, l3_payload_len, extra_len; - u32 skb_len, nsize, frag_data_len = 0; - u16 ipv6_fhl_ext = sizeof(struct frag_hdr); - __wsum frag_data_csum = 0; - u16 frag_offset = 0; - u8 *tmp = NULL; - int err; - - ip.hdr = skb_network_header(skb); - if (ip.v6->version == 6 && ip.v6->nexthdr != NEXTHDR_UDP) { - TXQ_STATS_INC(txq, ufo_pkt_unsupport); - return -EPROTONOSUPPORT; - } - - /* linearize the big ufo packet */ - err = skb_linearize(skb); - if (err) { - TXQ_STATS_INC(txq, ufo_linearize_err); - return err; - } - - extra_len = skb->len - HINIC_GSO_MAX_SIZE; - l2_l3_hlen = (u32)(skb_transport_header(skb) - skb_mac_header(skb)); - l3_payload_len = skb->len - l2_l3_hlen; - frag_data_len += extra_len + - ((l3_payload_len - extra_len) % gso_size); - skb_len = skb->len - frag_data_len; - - /* ipv6 need external frag header */ - if (ip.v6->version == 6) - nsize = frag_data_len + l2_l3_hlen + ipv6_fhl_ext; - else - nsize = frag_data_len + l2_l3_hlen; - - *ufo_skb = netdev_alloc_skb_ip_align(netdev, nsize); - if (!*ufo_skb) { - TXQ_STATS_INC(txq, ufo_alloc_skb_err); - return -ENOMEM; - } - - /* copy l2_l3 layer header from original skb to ufo_skb */ - skb_copy_from_linear_data_offset(skb, 0, skb_put(*ufo_skb, l2_l3_hlen), - l2_l3_hlen); - - /* reserve ipv6 external frag header for ufo_skb */ - if (ip.v6->version == 6) { - ipv6_fhdr.nexthdr = NEXTHDR_UDP; - ipv6_fhdr.reserved = 0; - frag_offset = (u16)(l3_payload_len - frag_data_len); - ipv6_fhdr.frag_off = htons(frag_offset); - ipv6_fhdr.identification = ip6_frag_id; - tmp = skb_put(*ufo_skb, ipv6_fhl_ext); - memcpy(tmp, &ipv6_fhdr, ipv6_fhl_ext); - } - - /* split original one skb to two parts: skb and ufo_skb */ - skb_split(skb, (*ufo_skb), skb_len); - - /* modify skb ip total len */ - ip.hdr = skb_network_header(skb); - if (ip.v4->version == 4) - ip.v4->tot_len = htons(ntohs(ip.v4->tot_len) - - (u16)frag_data_len); - else - ip.v6->payload_len = htons(ntohs(ip.v6->payload_len) - - (u16)frag_data_len); - - /* set ufo_skb network header */ - skb_set_network_header(*ufo_skb, skb_network_offset(skb)); - - /* set vlan offload feature */ - (*ufo_skb)->vlan_tci = skb->vlan_tci; - - /* modify ufo_skb ip total len, flag, frag_offset and compute csum */ - ip.hdr = skb_network_header(*ufo_skb); - if (ip.v4->version == 4) { - /* compute ufo_skb data csum and put into skb udp csum */ - tmp = (*ufo_skb)->data + l2_l3_hlen; - frag_data_csum = csum_partial(tmp, (int)frag_data_len, 0); - udp_hdr(skb)->check = - (__sum16)csum_add(~csum_fold(frag_data_csum), - udp_hdr(skb)->check); - - ip.v4->tot_len = htons((u16)(skb_network_header_len(skb) + - frag_data_len)); - ip.v4->frag_off = 0; - frag_offset = (u16)((l3_payload_len - frag_data_len) >> 3); - ip.v4->frag_off = htons(frag_offset); - ip_send_check(ip.v4); - } else { - /* compute ufo_skb data csum and put into skb udp csum */ - tmp = (*ufo_skb)->data + l2_l3_hlen + ipv6_fhl_ext; - frag_data_csum = csum_partial(tmp, (int)frag_data_len, 0); - udp_hdr(skb)->check = - (__sum16)csum_add(~csum_fold(frag_data_csum), - udp_hdr(skb)->check); - - ip.v6->payload_len = htons(ipv6_fhl_ext + (u16)frag_data_len); - ip.v6->nexthdr = NEXTHDR_FRAGMENT; - } - - return 0; -} -#endif - #define HINIC_FRAG_STATUS_OK 0 #define HINIC_FRAG_STATUS_IGNORE 1

@@ -895,10 +777,6 @@ netdev_tx_t hinic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) u16 q_id = skb_get_queue_mapping(skb); struct hinic_txq *txq; u8 flag = 0; -#ifdef HAVE_IP6_FRAG_ID_ENABLE_UFO - struct sk_buff *ufo_skb; - int err; -#endif

if (unlikely(!netif_carrier_ok(netdev) || !nic_dev->heart_status)) { @@ -914,41 +792,6 @@ netdev_tx_t hinic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) } txq = &nic_dev->txqs[q_id];

-#ifdef HAVE_IP6_FRAG_ID_ENABLE_UFO - /* UFO avoidance */ - if (unlikely(skb->len > HINIC_GSO_MAX_SIZE && - (skb_shinfo(skb)->gso_type & SKB_GSO_UDP))) { - TXQ_STATS_INC(txq, big_udp_pkts); - - err = hinic_ufo_avoidance(skb, &ufo_skb, netdev, txq); - if (err) - goto tx_drop_pkts; - - err = hinic_send_one_skb(skb, netdev, txq, &flag, - HINIC_TX_UFO_AVD); - if (err == NETDEV_TX_BUSY) { - dev_kfree_skb_any(ufo_skb); - return NETDEV_TX_BUSY; - } - - if (flag == HINIC_TX_DROPED) { - nicif_err(nic_dev, drv, netdev, "Send first skb failed for HINIC_TX_SKB_DROPED\n"); - dev_kfree_skb_any(ufo_skb); - return NETDEV_TX_OK; - } - - err = hinic_send_one_skb(ufo_skb, netdev, txq, &flag, - HINIC_TX_NON_AVD); - if (err == NETDEV_TX_BUSY) { - nicif_err(nic_dev, drv, netdev, "Send second skb failed for NETDEV_TX_BUSY\n"); - dev_kfree_skb_any(ufo_skb); - return NETDEV_TX_OK; - } - - return NETDEV_TX_OK; - } -#endif - return hinic_send_one_skb(skb, netdev, txq, &flag, HINIC_TX_NON_AVD);

tx_drop_pkts: