diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2014-02-13 19:05:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-13 18:09:30 -0500 |
commit | 730c8c69bc8d4640336885e20e719b0842d0fcb2 (patch) | |
tree | 3c48e5468778318b96ae42078f8470cb76707c35 /drivers | |
parent | ca52b6647ffc6bc0f4b80823006834646b3e4f04 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 | ||||
-rw-r--r-- | 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 040cb94e8219..88b40b514cb2 100644 --- 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) | |||
2098 | skb->len + 2); | 2098 | skb->len + 2); |
2099 | txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len, | 2099 | txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len, |
2100 | DMA_TO_DEVICE); | 2100 | DMA_TO_DEVICE); |
2101 | if (skb->len < ETHERSMALL) | 2101 | if (skb->len < ETH_ZLEN) |
2102 | txdesc->buffer_length = ETHERSMALL; | 2102 | txdesc->buffer_length = ETH_ZLEN; |
2103 | else | 2103 | else |
2104 | txdesc->buffer_length = skb->len; | 2104 | txdesc->buffer_length = skb->len; |
2105 | 2105 | ||
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index 6075915b88ec..d55e37cd5fec 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h | |||
@@ -27,8 +27,7 @@ | |||
27 | #define RX_RING_MIN 64 | 27 | #define RX_RING_MIN 64 |
28 | #define TX_RING_MAX 1024 | 28 | #define TX_RING_MAX 1024 |
29 | #define RX_RING_MAX 1024 | 29 | #define RX_RING_MAX 1024 |
30 | #define ETHERSMALL 60 | 30 | #define PKT_BUF_SZ 1538 |
31 | #define PKT_BUF_SZ 1538 | ||
32 | #define SH_ETH_TSU_TIMEOUT_MS 500 | 31 | #define SH_ETH_TSU_TIMEOUT_MS 500 |
33 | #define SH_ETH_TSU_CAM_ENTRIES 32 | 32 | #define SH_ETH_TSU_CAM_ENTRIES 32 |
34 | 33 | ||