Blame SOURCES/0006-netdrv-bnxt-call-devlink_port_type_eth_set-before-po.patch

f95c89
From 01c377f7da9b3c4c36cc9f764e0d133aab619e64 Mon Sep 17 00:00:00 2001
f95c89
From: Petr Oros <poros@redhat.com>
f95c89
Date: Thu, 5 Sep 2019 10:01:02 -0400
f95c89
Subject: [PATCH 06/96] [netdrv] bnxt: call devlink_port_type_eth_set() before
f95c89
 port register
f95c89
f95c89
Message-id: <cb34fbcb1af1e95d97609936c5d091d1043eca08.1567595345.git.poros@redhat.com>
f95c89
Patchwork-id: 270943
f95c89
O-Subject: [RHEL8.2 net PATCH 06/15] bnxt: call devlink_port_type_eth_set() before port register
f95c89
Bugzilla: 1737133
f95c89
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
f95c89
RH-Acked-by: Neil Horman <nhorman@redhat.com>
f95c89
RH-Acked-by: John Linville <linville@redhat.com>
f95c89
RH-Acked-by: Ivan Vecera <ivecera@redhat.com>
f95c89
f95c89
Bugzilla: http://bugzilla.redhat.com/show_bug.cgi?id=1737133
f95c89
f95c89
Upstream commit(s):
f95c89
commit c3f10cbcaa3d5e1980733c3ccd0261df426412d2
f95c89
Author: Jiri Pirko <jiri@mellanox.com>
f95c89
Date:   Sun Mar 24 11:14:28 2019 +0100
f95c89
f95c89
    bnxt: call devlink_port_type_eth_set() before port register
f95c89
f95c89
    Call devlink_port_type_eth_set() before devlink_port_register(). Bnxt
f95c89
    instances won't change type during lifetime. This avoids one extra
f95c89
    userspace devlink notification.
f95c89
f95c89
    Signed-off-by: Jiri Pirko <jiri@mellanox.com>
f95c89
    Signed-off-by: David S. Miller <davem@davemloft.net>
f95c89
f95c89
Signed-off-by: Petr Oros <poros@redhat.com>
f95c89
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
f95c89
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
f95c89
---
f95c89
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +-
f95c89
 1 file changed, 1 insertion(+), 1 deletion(-)
f95c89
f95c89
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
f95c89
===================================================================
f95c89
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c	2020-02-06 16:23:11.535551475 +0100
f95c89
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c	2020-02-06 16:23:11.657550355 +0100
f95c89
@@ -229,6 +229,7 @@
f95c89
 		goto err_dl_unreg;
f95c89
 	}
f95c89
 
f95c89
+	devlink_port_type_eth_set(&bp->dl_port, bp->dev);
f95c89
 	devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
f95c89
 			       bp->pf.port_id, false, 0);
f95c89
 	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
f95c89
@@ -236,7 +237,6 @@
f95c89
 		netdev_err(bp->dev, "devlink_port_register failed");
f95c89
 		goto err_dl_param_unreg;
f95c89
 	}
f95c89
-	devlink_port_type_eth_set(&bp->dl_port, bp->dev);
f95c89
 
f95c89
 	rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
f95c89
 					  ARRAY_SIZE(bnxt_dl_port_params));