diff options
author | Dave Jones <davej@redhat.com> | 2007-02-28 15:41:39 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 20:16:10 -0500 |
commit | 471a567144b91c8f2b7a71a1cf8babe7331590b1 (patch) | |
tree | b6488e33ce9e4029c05bc5b4b009adb10d5b3192 /drivers | |
parent | 63f779261f9aa16a0196c51092bedfdd32493f9d (diff) |
Fix mv643xx_eth compilation.
Commit 908b637fe793165b6aecdc875cdca67c4959a1ad removed ETH_DMA_ALIGN
but missed a usage of it in a macro, which broke the build.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/mv643xx_eth.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h index 7cb0a41c5cb4..7d4e90cf49e8 100644 --- a/drivers/net/mv643xx_eth.h +++ b/drivers/net/mv643xx_eth.h | |||
@@ -9,6 +9,8 @@ | |||
9 | 9 | ||
10 | #include <linux/mv643xx.h> | 10 | #include <linux/mv643xx.h> |
11 | 11 | ||
12 | #include <asm/dma-mapping.h> | ||
13 | |||
12 | /* Checksum offload for Tx works for most packets, but | 14 | /* Checksum offload for Tx works for most packets, but |
13 | * fails if previous packet sent did not use hw csum | 15 | * fails if previous packet sent did not use hw csum |
14 | */ | 16 | */ |
@@ -47,7 +49,7 @@ | |||
47 | #define ETH_HW_IP_ALIGN 2 /* hw aligns IP header */ | 49 | #define ETH_HW_IP_ALIGN 2 /* hw aligns IP header */ |
48 | #define ETH_WRAPPER_LEN (ETH_HW_IP_ALIGN + ETH_HLEN + \ | 50 | #define ETH_WRAPPER_LEN (ETH_HW_IP_ALIGN + ETH_HLEN + \ |
49 | ETH_VLAN_HLEN + ETH_FCS_LEN) | 51 | ETH_VLAN_HLEN + ETH_FCS_LEN) |
50 | #define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + ETH_DMA_ALIGN) | 52 | #define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + dma_get_cache_alignment()) |
51 | 53 | ||
52 | #define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */ | 54 | #define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */ |
53 | #define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */ | 55 | #define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */ |