Commit 58e0c348 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by David S. Miller
Browse files

ftgmac100: Move ftgmac100_hard_start_xmit() around 



Move it below ftgmac100_xmit() and the rest of the tx path

No code change.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3ca8fb1

drivers/net/ethernet/faraday/ftgmac100.c

+29 −29
Original line number Diff line number Diff line
@@ -675,6 +675,35 @@ static int ftgmac100_xmit(struct ftgmac100 *priv, struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



static int ftgmac100_hard_start_xmit(struct sk_buff *skb,

				     struct net_device *netdev)

{

	struct ftgmac100 *priv = netdev_priv(netdev);

	dma_addr_t map;



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

		if (net_ratelimit())

			netdev_dbg(netdev, "tx packet too big\n");



		netdev->stats.tx_dropped++;

		kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	map = dma_map_single(priv->dev, skb->data, skb_headlen(skb), DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(priv->dev, map))) {

		/* drop packet */

		if (net_ratelimit())

			netdev_err(netdev, "map socket buffer failed\n");



		netdev->stats.tx_dropped++;

		kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	return ftgmac100_xmit(priv, skb, map);

}



static void ftgmac100_free_buffers(struct ftgmac100 *priv)

{

	int i;
@@ -1212,35 +1241,6 @@ static int ftgmac100_stop(struct net_device *netdev) 
	return 0;

}



static int ftgmac100_hard_start_xmit(struct sk_buff *skb,

				     struct net_device *netdev)

{

	struct ftgmac100 *priv = netdev_priv(netdev);

	dma_addr_t map;



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

		if (net_ratelimit())

			netdev_dbg(netdev, "tx packet too big\n");



		netdev->stats.tx_dropped++;

		kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	map = dma_map_single(priv->dev, skb->data, skb_headlen(skb), DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(priv->dev, map))) {

		/* drop packet */

		if (net_ratelimit())

			netdev_err(netdev, "map socket buffer failed\n");



		netdev->stats.tx_dropped++;

		kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	return ftgmac100_xmit(priv, skb, map);

}



/* optional */

static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)

{