diff options
| author |   Kejian Yan <yankejian@huawei.com> | 2017-02-09 11:46:15 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-10 13:40:30 -0500 |
| commit | b85ea006b6bebb692628f11882af41c3e12e1e09 (patch) | |
| tree | ae0a5849478c04835e9dd2b7380a0df80b48ad53 /drivers/net/ethernet/hisilicon/hns/hns_enet.c | |
| parent | net: phy: Initialize mdio clock at probe function (diff) | |
| download | linux-dev-b85ea006b6bebb692628f11882af41c3e12e1e09.tar.xz linux-dev-b85ea006b6bebb692628f11882af41c3e12e1e09.zip | |
net: hns: Fix the device being used for dma mapping during TX
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>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_enet.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c index 672b64606321..8aed72860e7c 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c @@ -305,8 +305,8 @@ int hns_nic_net_xmit_hw(struct net_device *ndev, struct hns_nic_ring_data *ring_data) { struct hns_nic_priv *priv = netdev_priv(ndev); - struct device *dev = priv->dev; struct hnae_ring *ring = ring_data->ring; + struct device *dev = ring_to_dev(ring); struct netdev_queue *dev_queue; struct skb_frag_struct *frag; int buf_num; |