| Message ID | 20210709190830.5405-9-asmaa@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Cherry-pick the upstreamed mlxbf-gige driver | expand |
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c index ba6fd81d8fe6..be6acb3c09f8 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c @@ -21,7 +21,7 @@ #include "mlxbf_gige_regs.h" #define DRV_NAME "mlxbf_gige" -#define DRV_VERSION "1.9" +#define DRV_VERSION "1.8" static void mlxbf_gige_set_mac_rx_filter(struct mlxbf_gige *priv, unsigned int index, u64 dmac) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c index dfe68aef9707..3b241d1491f9 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c @@ -223,10 +223,6 @@ irqreturn_t mlxbf_gige_mdio_handle_phy_interrupt(int irq, void *dev_id) if (phydev->drv->ack_interrupt) phydev->drv->ack_interrupt(phydev); - phydev->interrupts = PHY_INTERRUPT_ENABLED; - if (phydev->drv->config_intr) - phydev->drv->config_intr(phydev); - return IRQ_HANDLED; }
BugLink: https://bugs.launchpad.net/bugs/1934923 This reverts commit 6793808914c0604c2c890a9551cc28f835412a1f. Signed-off-by: Asmaa Mnebhi <asmaa@nvidia.com> --- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)