Skip to contentSkip to conversation

net: hns: fix variable used when DEBUG is defined

PATCH Applied [email protected] 2 participants 2 messages Jan 17, 2021 – Jan 19, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: hns: fix variable used when DEBUG is defined

From: Tom Rix <[email protected]>

When DEBUG is defined this error occurs

drivers/net/ethernet/hisilicon/hns/hns_enet.c:1505:36: error:
‘struct net_device’ has no member named ‘ae_handle’; did you mean ‘rx_handler’?

  assert(skb->queue_mapping < ndev->ae_handle->q_num);
                                    ^~~~~~~~~

ae_handle is an element of struct hns_nic_priv, so change ndev to priv.

Fixes b5996f11ea54 ("net: add Hisilicon Network Subsystem basic ethernet support")
---
 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
index 858cb293152a..5d7824d2b4d4 100644
@@ -1502,7 +1502,7 @@ static netdev_tx_t hns_nic_net_xmit(struct sk_buff *skb,
 {
 	struct hns_nic_priv *priv = netdev_priv(ndev);
 
-	assert(skb->queue_mapping < ndev->ae_handle->q_num);
+	assert(skb->queue_mapping < priv->ae_handle->q_num);
 
 	return hns_nic_net_xmit_hw(ndev, skb,
 				   &tx_ring_data(priv, skb->queue_mapping));
Signature · 1 line
2.27.0
#1 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 11 lines · On Sun, 17 Jan 2021 11:10:44 -0800 you wrote:

From: Tom Rix <[email protected]>

When DEBUG is defined this error occurs

drivers/net/ethernet/hisilicon/hns/hns_enet.c:1505:36: error:
‘struct net_device’ has no member named ‘ae_handle’; did you mean ‘rx_handler’?

  assert(skb->queue_mapping < ndev->ae_handle->q_num);
                                    ^~~~~~~~~

[...]

Here is the summary with links:
- net: hns: fix variable used when DEBUG is defined

    https://git.kernel.org/netdev/net-next/c/99d518970c5a

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html