lkml.org 
[lkml]   [2005]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[09/11] r8169: receive descriptor length fix

    -stable review patch. If anyone has any objections, please let us know.

    ------------------


    The status and received packets indication in the Rx descriptor ring
    are not correctly reset when a descriptor is recycled.

    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    diff -puN drivers/net/r8169.c~r8169-490 drivers/net/r8169.c
    --- a/drivers/net/r8169.c~r8169-490 2005-03-08 00:01:26.000000000 +0100
    +++ b/drivers/net/r8169.c 2005-03-09 00:38:34.235464833 +0100
    @@ -1683,16 +1683,19 @@ static void rtl8169_free_rx_skb(struct r
    rtl8169_make_unusable_by_asic(desc);
    }

    -static inline void rtl8169_return_to_asic(struct RxDesc *desc, int rx_buf_sz)
    +static inline void rtl8169_mark_to_asic(struct RxDesc *desc, u32 rx_buf_sz)
    {
    - desc->opts1 |= cpu_to_le32(DescOwn + rx_buf_sz);
    + u32 eor = le32_to_cpu(desc->opts1) & RingEnd;
    +
    + desc->opts1 = cpu_to_le32(DescOwn | eor | rx_buf_sz);
    }

    -static inline void rtl8169_give_to_asic(struct RxDesc *desc, dma_addr_t mapping,
    - int rx_buf_sz)
    +static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
    + u32 rx_buf_sz)
    {
    desc->addr = cpu_to_le64(mapping);
    - desc->opts1 |= cpu_to_le32(DescOwn + rx_buf_sz);
    + wmb();
    + rtl8169_mark_to_asic(desc, rx_buf_sz);
    }

    static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
    @@ -1712,7 +1715,7 @@ static int rtl8169_alloc_rx_skb(struct p
    mapping = pci_map_single(pdev, skb->tail, rx_buf_sz,
    PCI_DMA_FROMDEVICE);

    - rtl8169_give_to_asic(desc, mapping, rx_buf_sz);
    + rtl8169_map_to_asic(desc, mapping, rx_buf_sz);

    out:
    return ret;
    @@ -2150,7 +2153,7 @@ static inline int rtl8169_try_rx_copy(st
    skb_reserve(skb, NET_IP_ALIGN);
    eth_copy_and_sum(skb, sk_buff[0]->tail, pkt_size, 0);
    *sk_buff = skb;
    - rtl8169_return_to_asic(desc, rx_buf_sz);
    + rtl8169_mark_to_asic(desc, rx_buf_sz);
    ret = 0;
    }
    }
    _

    --
    Ueimor

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:11    [W:0.021 / U:60.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site