Skip to content

Commit 716cca0

Browse files
Kejian Yangregkh
authored andcommitted
net: hns: Fix the device being used for dma mapping during TX
[ Upstream commit b85ea006b6bebb692628f11882af41c3e12e1e09 ] This patch fixes the device being used to DMA map skb->data. Erroneous device assignment causes the crash when SMMU is enabled. This happens during TX since buffer gets DMA mapped with device correspondign to net_device and gets unmapped using the device related to DSAF. Signed-off-by: Kejian Yan <yankejian@huawei.com> Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com> Signed-off-by: Salil Mehta <salil.mehta@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent aacf9de commit 716cca0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/ethernet/hisilicon/hns/hns_enet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ int hns_nic_net_xmit_hw(struct net_device *ndev,
105105
struct hns_nic_ring_data *ring_data)
106106
{
107107
struct hns_nic_priv *priv = netdev_priv(ndev);
108-
struct device *dev = priv->dev;
109108
struct hnae_ring *ring = ring_data->ring;
109+
struct device *dev = ring_to_dev(ring);
110110
struct netdev_queue *dev_queue;
111111
struct skb_frag_struct *frag;
112112
int buf_num;

0 commit comments

Comments
 (0)