| Message ID | 20220919025840.256411-1-renzhijie2@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 54b9a2bb6c013a34cfdb5a6241367b003773662f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next] octeontx2-pf: Fix unused variable build error | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 19 Sep 2022 10:58:40 +0800 you wrote: > If CONFIG_DCB is not set, > make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu-, > will be failed, like this: > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c: In function ‘otx2_select_queue’: > drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c:1886:19: error: unused variable ‘pf’ [-Werror=unused-variable] > struct otx2_nic *pf = netdev_priv(netdev); > ^~ > cc1: all warnings being treated as errors > > [...] Here is the summary with links: - [-next] octeontx2-pf: Fix unused variable build error https://git.kernel.org/netdev/net-next/c/54b9a2bb6c01 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c index 49a4ff01cecb..9f5cb213c6d7 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c @@ -1883,8 +1883,8 @@ static netdev_tx_t otx2_xmit(struct sk_buff *skb, struct net_device *netdev) static u16 otx2_select_queue(struct net_device *netdev, struct sk_buff *skb, struct net_device *sb_dev) { - struct otx2_nic *pf = netdev_priv(netdev); #ifdef CONFIG_DCB + struct otx2_nic *pf = netdev_priv(netdev); u8 vlan_prio; #endif
If CONFIG_DCB is not set, make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu-, will be failed, like this: drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c: In function ‘otx2_select_queue’: drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c:1886:19: error: unused variable ‘pf’ [-Werror=unused-variable] struct otx2_nic *pf = netdev_priv(netdev); ^~ cc1: all warnings being treated as errors To fix this build error, put the definition of *pf under the CONFIG_DCB. Fixes: 99c969a83d82 ("octeontx2-pf: Add egress PFC support") Signed-off-by: Ren Zhijie <renzhijie2@huawei.com> --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)