Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dc351da authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns-fixes' 



Lin Yun Sheng says:

====================
Bugfixs for hns ethernet driver

This patchset fix skb used after free and C45 op code issues
in hns driver.

Patch V2:
	1. Remove ndev->feature checking in TX description patch.
	2. Add Fixes: Tag in patch description.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 233a1587 27463ad9

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

+10 −12
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static void fill_tso_desc(struct hnae_ring *ring, void *priv, 
			     mtu);

}



int hns_nic_net_xmit_hw(struct net_device *ndev,

netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,

				struct sk_buff *skb,

				struct hns_nic_ring_data *ring_data)

{
@@ -361,6 +361,10 @@ int hns_nic_net_xmit_hw(struct net_device *ndev, 
	dev_queue = netdev_get_tx_queue(ndev, skb->queue_mapping);

	netdev_tx_sent_queue(dev_queue, skb->len);



	netif_trans_update(ndev);

	ndev->stats.tx_bytes += skb->len;

	ndev->stats.tx_packets++;



	wmb(); /* commit all data before submit */

	assert(skb->queue_mapping < priv->ae_handle->q_num);

	hnae_queue_xmit(priv->ae_handle->qs[skb->queue_mapping], buf_num);
@@ -1469,17 +1473,11 @@ static netdev_tx_t hns_nic_net_xmit(struct sk_buff *skb, 
				    struct net_device *ndev)

{

	struct hns_nic_priv *priv = netdev_priv(ndev);

	int ret;



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

	ret = hns_nic_net_xmit_hw(ndev, skb,



	return hns_nic_net_xmit_hw(ndev, skb,

				   &tx_ring_data(priv, skb->queue_mapping));

	if (ret == NETDEV_TX_OK) {

		netif_trans_update(ndev);

		ndev->stats.tx_bytes += skb->len;

		ndev->stats.tx_packets++;

	}

	return (netdev_tx_t)ret;

}



static void hns_nic_drop_rx_fetch(struct hns_nic_ring_data *ring_data,

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

+3 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void hns_ethtool_set_ops(struct net_device *ndev); 
void hns_nic_net_reset(struct net_device *ndev);

void hns_nic_net_reinit(struct net_device *netdev);

int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h);

int hns_nic_net_xmit_hw(struct net_device *ndev,

netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,

				struct sk_buff *skb,

				struct hns_nic_ring_data *ring_data);

drivers/net/ethernet/hisilicon/hns_mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int hns_mdio_write(struct mii_bus *bus, 


		/* config the data needed writing */

		cmd_reg_cfg = devad;

		op = MDIO_C45_WRITE_ADDR;

		op = MDIO_C45_WRITE_DATA;

	}



	MDIO_SET_REG_FIELD(mdio_dev, MDIO_WDATA_REG, MDIO_WDATA_DATA_M,