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: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 040cb94e8219cf8438dd2017164fca8387be45db..88b40b514cb246c0b6621b2c765b1edbd773e4f2 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2098,8 +2098,8 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                                 skb->len + 2);
        txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,
                                      DMA_TO_DEVICE);
-       if (skb->len < ETHERSMALL)
-               txdesc->buffer_length = ETHERSMALL;
+       if (skb->len < ETH_ZLEN)
+               txdesc->buffer_length = ETH_ZLEN;
        else
                txdesc->buffer_length = skb->len;
 

diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 6075915b88ece2f42e59a70ab160cd5bd7f6a423..d55e37cd5fec04abcd6bc4e52827351e74d5fbdb 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -27,8 +27,7 @@
 #define RX_RING_MIN    64
 #define TX_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_CAM_ENTRIES 32