You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
2.1 KiB
55 lines
2.1 KiB
From f7f07fe8710c6c3d67bdfba964466f7ca1deaeec Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:37:13 -0500
|
|
Subject: [PATCH 056/139] [netdrv] net: atlantic: remove duplicate entries
|
|
|
|
Message-id: <1604687916-15087-57-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338483
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 056/139] net: atlantic: remove duplicate entries
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit b585f8602acbe2620212cbedc1760906814ff515
|
|
Author: Igor Russkikh <irusskikh@marvell.com>
|
|
Date: Mon Jan 6 14:22:30 2020 +0300
|
|
|
|
net: atlantic: remove duplicate entries
|
|
|
|
Function entries were duplicated accidentally, removing the dups.
|
|
|
|
Fixes: ea4b4d7fc106 ("net: atlantic: loopback tests via private flags")
|
|
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
|
|
index 58e891af6e09..ec041f78d063 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
|
|
@@ -1525,9 +1525,6 @@ const struct aq_hw_ops hw_atl_ops_b0 = {
|
|
.rx_extract_ts = hw_atl_b0_rx_extract_ts,
|
|
.extract_hwts = hw_atl_b0_extract_hwts,
|
|
.hw_set_offload = hw_atl_b0_hw_offload_set,
|
|
- .hw_get_hw_stats = hw_atl_utils_get_hw_stats,
|
|
- .hw_get_fw_version = hw_atl_utils_get_fw_version,
|
|
- .hw_set_offload = hw_atl_b0_hw_offload_set,
|
|
.hw_set_loopback = hw_atl_b0_set_loopback,
|
|
.hw_set_fc = hw_atl_b0_set_fc,
|
|
};
|
|
--
|
|
2.13.6
|
|
|