diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-14 13:18:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-14 13:18:10 -0700 |
| commit | c8a867a38fc8d88a096ebf8813d02bbf50f7335e (patch) | |
| tree | 8f24186b20cc6fa2f4869ed237129187bc3709b4 /drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | |
| parent | acb6d3771a0390fdfae18082f232fda40d5ab514 (diff) | |
| parent | 5c6cfd309faa7a1958c14b937ba9b95abb1427de (diff) | |
Merge branch 'net-hns3-add-some-cleanups-for-next'
Huazhong Tan says:
====================
net: hns3: add some cleanups for -next
This patchset adds some cleanups for the HNS3 ethernet driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns3/hns3_enet.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index c79d6a391105..9fe40c7773b4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1445,9 +1445,6 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev) bd_num += ret; - if (!skb_has_frag_list(skb)) - goto out; - skb_walk_frags(skb, frag_skb) { ret = hns3_fill_skb_to_desc(ring, frag_skb, DESC_TYPE_FRAGLIST_SKB); @@ -1456,7 +1453,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev) bd_num += ret; } -out: + pre_ntu = ring->next_to_use ? (ring->next_to_use - 1) : (ring->desc_num - 1); ring->desc[pre_ntu].tx.bdtp_fe_sc_vld_ra_ri |= |