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

Merge branch 'ethoc-fixes' 



Florian Fainelli says:

====================
net: ethoc: Error path and transmit fixes

This patch series contains two patches for the ethoc driver while testing on a
TS-7300 board where ethoc is provided by an on-board FPGA.

First patch was cooked after chasing crashes with invalid resources passed to
the driver.

Second patch was cooked after seeing that an interface configured with IP
192.168.2.2 was sending ARP packets for 192.168.0.0, no wonder why it could not
work.

I don't have access to any other platform using an ethoc interface so
it could be good to some testing on Xtensa for instance.

Changes in v3:

- corrected the error path if skb_put_padto() fails, thanks to Max
  for spotting this!

Changes in v2:

- fixed the first commit message
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 136ab0d0 ee6c21b9

drivers/net/ethernet/ethoc.c

+11 −5
Original line number Diff line number Diff line
@@ -860,6 +860,11 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	unsigned int entry;

	void *dest;



	if (skb_put_padto(skb, ETHOC_ZLEN)) {

		dev->stats.tx_errors++;

		goto out_no_free;

	}



	if (unlikely(skb->len > ETHOC_BUFSIZ)) {

		dev->stats.tx_errors++;

		goto out;
@@ -894,6 +899,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	skb_tx_timestamp(skb);

out:

	dev_kfree_skb(skb);

out_no_free:

	return NETDEV_TX_OK;

}
@@ -1086,7 +1092,7 @@ static int ethoc_probe(struct platform_device *pdev) 
	if (!priv->iobase) {

		dev_err(&pdev->dev, "cannot remap I/O memory space\n");

		ret = -ENXIO;

		goto error;

		goto free;

	}



	if (netdev->mem_end) {
@@ -1095,7 +1101,7 @@ static int ethoc_probe(struct platform_device *pdev) 
		if (!priv->membase) {

			dev_err(&pdev->dev, "cannot remap memory space\n");

			ret = -ENXIO;

			goto error;

			goto free;

		}

	} else {

		/* Allocate buffer memory */
@@ -1106,7 +1112,7 @@ static int ethoc_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "cannot allocate %dB buffer\n",

				buffer_size);

			ret = -ENOMEM;

			goto error;

			goto free;

		}

		netdev->mem_end = netdev->mem_start + buffer_size;

		priv->dma_alloc = buffer_size;
@@ -1120,7 +1126,7 @@ static int ethoc_probe(struct platform_device *pdev) 
		128, (netdev->mem_end - netdev->mem_start + 1) / ETHOC_BUFSIZ);

	if (num_bd < 4) {

		ret = -ENODEV;

		goto error;

		goto free;

	}

	priv->num_bd = num_bd;

	/* num_tx must be a power of two */
@@ -1133,7 +1139,7 @@ static int ethoc_probe(struct platform_device *pdev) 
	priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void *), GFP_KERNEL);

	if (!priv->vma) {

		ret = -ENOMEM;

		goto error;

		goto free;

	}



	/* Allow the platform setup code to pass in a MAC address. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE