Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Dave Jones and committed by Jeff Garzik 471a5671 63f77926
+3
-1
drivers/net/mv643xx_eth.h
+3
-1
drivers/net/mv643xx_eth.h
···
9
10
#include <linux/mv643xx.h>
11
12
/* Checksum offload for Tx works for most packets, but
13
* fails if previous packet sent did not use hw csum
14
*/
···
49
#define ETH_HW_IP_ALIGN 2 /* hw aligns IP header */
50
#define ETH_WRAPPER_LEN (ETH_HW_IP_ALIGN + ETH_HLEN + \
51
ETH_VLAN_HLEN + ETH_FCS_LEN)
52
-
#define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + ETH_DMA_ALIGN)
53
54
#define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */
55
#define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */
···
9
10
#include <linux/mv643xx.h>
11
12
+
#include <asm/dma-mapping.h>
13
+
14
/* Checksum offload for Tx works for most packets, but
15
* fails if previous packet sent did not use hw csum
16
*/
···
47
#define ETH_HW_IP_ALIGN 2 /* hw aligns IP header */
48
#define ETH_WRAPPER_LEN (ETH_HW_IP_ALIGN + ETH_HLEN + \
49
ETH_VLAN_HLEN + ETH_FCS_LEN)
50
+
#define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + dma_get_cache_alignment())
51
52
#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 */