| From 9a0fd1c203823f4a7e1ff13aa4406e74e9d87eec Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Fri, 14 Feb 2014 03:05:42 +0300 |
| Subject: 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> |
| (cherry picked from commit 730c8c69bc8d4640336885e20e719b0842d0fcb2) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 4 ++-- |
| drivers/net/ethernet/renesas/sh_eth.h | 3 +-- |
| 2 files changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 957f0ffe31c4..6f1884d7804b 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -2112,8 +2112,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 a096b4bf9799..b37c427144ee 100644 |
| --- 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 |
| |
| -- |
| 2.1.2 |
| |
