[PATCH 11/12] r8169: align the IP header when there is no DMA constraint

[Francois Romieu]

Align the IP header when the chipset can DMA at any location (plain 0x8169).
Otherwise (0x8136/0x8168) obey the constraint imposed by the hardware.

This patch complements the previous alignment rework done for copybreak.

Original idea from Philip Craig <[EMAIL PROTECTED]>

Signed-off-by: Francois Romieu <[EMAIL PROTECTED]>
Cc: Philip Craig <[EMAIL PROTECTED]>
Cc: Mike Isely <[EMAIL PROTECTED]>
---
 drivers/net/r8169.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 2cbb63b..2667862 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1500,7 +1500,7 @@ static const struct rtl_cfg_info {
        [RTL_CFG_0] = {
                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
-               .align          = 2,
+               .align          = 0,
                .intr_event     = SYSErr | LinkChg | RxOverflow |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
@@ -2189,13 +2189,17 @@ static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, 
struct sk_buff **sk_buff,
 {
        struct sk_buff *skb;
        dma_addr_t mapping;
+       unsigned int pad;
        int ret = 0;
 
-       skb = dev_alloc_skb(rx_buf_sz + align);
+       pad = align ? align : NET_IP_ALIGN;
+
+       skb = dev_alloc_skb(rx_buf_sz + pad);
        if (!skb)
                goto err_out;
 
-       skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
+
+       skb_reserve(skb, align ? ((pad - 1) & (unsigned long)skb->data) : pad);
        *sk_buff = skb;
 
        mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
-- 
1.4.4.2
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html