diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2013-05-13 07:58:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-14 14:32:04 -0400 |
commit | c14ff2ea2d5818c811e5c6e67e794df4a71a6094 (patch) | |
tree | d6f41aa47097c79ee50c26f4111a279e063cfe1b /drivers/net/ethernet/sfc/net_driver.h | |
parent | 0f0d15100a8ac875bdd408324c473e16d73d3557 (diff) |
sfc: Delete EFX_PAGE_IP_ALIGN, equivalent to NET_IP_ALIGN
The two architectures that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
(powerpc and x86) now both define NET_IP_ALIGN as 0, so there is no
need for this optimisation any more.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/net_driver.h')
-rw-r--r-- | drivers/net/ethernet/sfc/net_driver.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index 9bd433a095c5..5efddf3c66e9 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h | |||
@@ -468,24 +468,11 @@ enum nic_state { | |||
468 | }; | 468 | }; |
469 | 469 | ||
470 | /* | 470 | /* |
471 | * Alignment of page-allocated RX buffers | ||
472 | * | ||
473 | * Controls the number of bytes inserted at the start of an RX buffer. | ||
474 | * This is the equivalent of NET_IP_ALIGN [which controls the alignment | ||
475 | * of the skb->head for hardware DMA]. | ||
476 | */ | ||
477 | #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS | ||
478 | #define EFX_PAGE_IP_ALIGN 0 | ||
479 | #else | ||
480 | #define EFX_PAGE_IP_ALIGN NET_IP_ALIGN | ||
481 | #endif | ||
482 | |||
483 | /* | ||
484 | * Alignment of the skb->head which wraps a page-allocated RX buffer | 471 | * Alignment of the skb->head which wraps a page-allocated RX buffer |
485 | * | 472 | * |
486 | * The skb allocated to wrap an rx_buffer can have this alignment. Since | 473 | * The skb allocated to wrap an rx_buffer can have this alignment. Since |
487 | * the data is memcpy'd from the rx_buf, it does not need to be equal to | 474 | * the data is memcpy'd from the rx_buf, it does not need to be equal to |
488 | * EFX_PAGE_IP_ALIGN. | 475 | * NET_IP_ALIGN. |
489 | */ | 476 | */ |
490 | #define EFX_PAGE_SKB_ALIGN 2 | 477 | #define EFX_PAGE_SKB_ALIGN 2 |
491 | 478 | ||