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

Commit 730c8c69 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: use ETH_ZLEN instead of home-grown #define 



The driver #define's and uses ETHERSMALL macro for the minimum Ethernet frame
size for which we have a standard macro ETH_ZLEN.  Use the latter  instead of
the home-grown one.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca52b664

drivers/net/ethernet/renesas/sh_eth.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2098,8 +2098,8 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
				 skb->len + 2);

				 skb->len + 2);

	txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,

	txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,

				      DMA_TO_DEVICE);

				      DMA_TO_DEVICE);

	if (skb->len < ETHERSMALL)

	if (skb->len < ETH_ZLEN)

		txdesc->buffer_length = ETHERSMALL;

		txdesc->buffer_length = ETH_ZLEN;

	else

	else

		txdesc->buffer_length = skb->len;

		txdesc->buffer_length = skb->len;

drivers/net/ethernet/renesas/sh_eth.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ 
#define RX_RING_MIN	64

#define RX_RING_MIN	64

#define TX_RING_MAX	1024

#define TX_RING_MAX	1024

#define RX_RING_MAX	1024

#define RX_RING_MAX	1024

#define ETHERSMALL		60

#define PKT_BUF_SZ	1538

#define PKT_BUF_SZ	1538

#define SH_ETH_TSU_TIMEOUT_MS	500

#define SH_ETH_TSU_TIMEOUT_MS	500

#define SH_ETH_TSU_CAM_ENTRIES	32

#define SH_ETH_TSU_CAM_ENTRIES	32